transmit file name correctly for meta edit

svn path=/trunk/; revision=47

diff --git a/actions/meta.sh b/actions/meta.sh
index 6de9f3890db1b8f77c9fbca22dd464a45d34fc9a..25799b88a4bde1826c63ce2f0e908ece05231237 100755 (executable)
--- a/actions/meta.sh
+++ b/actions/meta.sh
@@ -25,7 +25,7 @@ n=0; while [ -n "$_POST[\"tag$n\"]" ]; do
   n=$(($n + 1))
 done
 
-[ -z "$cancel" ] && if [ -n "$trash" ]; then
+[ -z "$cancel" -a -n "$info" ] && if [ -n "$trash" ]; then
   rm "${_DATA}/thumbs/$info.jpg" 2>/dev/null
   mv "${_DATA}/videos/$info" "${_DATA}/meta/$info.meta" "${_DATA}/trash/" 2>/dev/null
   rm "${_DATA}/cache/$info.cache" 2>/dev/null

diff --git a/pages/common.sh b/pages/common.sh
index aad976930adc3bcbd6f39107c59e7baa455a0438..739f4caf1726629f685055a24afa62d12b48dbd0 100755 (executable)
--- a/pages/common.sh
+++ b/pages/common.sh
@@ -24,7 +24,7 @@ page=$(echo -E "$_GET[\"p\"]" |egrep '^[0-9]+$')
 [ -z "$page" ] && page=0
 
 page_link=''
-[ -n "$info" ]   && page_link="i=$(echo -En "$info" |sed -r 's:%:%25:g;s:\&:%26:g;')&"
+[ -n "$info" ]   && page_link="i=$(urlsave "$info")&"
 [ -n "$order" ]  && page_link="${page_link}o=${order}&"
 [ -n "$search" ] && page_link="${page_link}s=${search}&"
 [ -n "$filter" ] && page_link="${page_link}f=${filter}&"

diff --git a/pages/view.sh b/pages/view.sh
index 8bbd434cd831e51a0ed48e8dcf0409e7edafc4c5..15202705e4433d432c6d8565eab735e49a9e7b70 100755 (executable)
--- a/pages/view.sh
+++ b/pages/view.sh
@@ -17,9 +17,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Serve0.  If not, see <http://www.gnu.org/licenses/>. 
 
-. $_EXEC/pages/common.sh
-
 info="$_GET[\"i\"]"
+. $_EXEC/pages/common.sh
 
 meta="${_DATA}/meta/$info.meta"
 video="${_DATA}/videos/$info"