From: paul <paul@plutz.net>
Date: Wed, 12 Nov 2014 18:48:05 +0000 (+0000)
Subject: escape & character in video url
X-Git-Url: http://git.plutz.net/?p=serve0;a=commitdiff_plain;h=0ae9cd05b899e89a40ef98f4d34fb1e30f2f6123

escape & character in video url

svn path=/trunk/; revision=23
---

diff --git a/pages/videoview.sh b/pages/videoview.sh
index fe70493..d05c519 100755
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -90,7 +90,7 @@ _printVideo(){
     [ -r "$meta" ] || ". ${_EXEC}/helpers/genmeta.sh" "$video" "$meta"
     [ -r "$thumb" ] || ". ${_EXEC}/helpers/genthumb.sh" "$video" "$thumb"
     [ -L "$mpfake" ] || ln -s "../videos/$info" "$mpfake"
-    video="$(echo "videos/$info" |sed 's/\?/\%6F/g')"
+    video="$(echo "videos/$info" |sed 's/\?/\%6F/g;s/&/\%26/g')"
     thumb="$(echo "thumbs/$info.jpg" |sed 's/\?/%6F/g')"
     mpfake="$(echo "$info" |sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:mp4/\1.mp4:' |sed 's/\?/%6F/g')"