prevent faulty form fill in bookmark editor

svn path=/trunk/; revision=160

diff --git a/actions/update_bookmarks.sh b/actions/update_bookmarks.sh
index 6a17d04d0655b8231cdd6d032fc6a447061e1203..68fd5abb13058dac9a47b8176823bf12440c9c84 100755 (executable)
--- a/actions/update_bookmarks.sh
+++ b/actions/update_bookmarks.sh
@@ -30,5 +30,4 @@ case "${_POST[submit]}" in
     ;;
 esac
 
-
 redirect "${url}"

diff --git a/templates/frame.html.sh b/templates/frame.html.sh
index db31ad839b92755f639e77a4191d5f43da8b3a23..90e0e32d76f4b37cebc19ecef93ff95d2d05d001 100755 (executable)
--- a/templates/frame.html.sh
+++ b/templates/frame.html.sh
@@ -50,7 +50,9 @@ cat <<EOF
           printf '<input type="hidden" name="bm_url" value="%s" />
                   <input type="text" name="bm_name" value="%s" readonly="readonly" /
                   ><button type="submit" name="submit" value="del">%s</button>' \
-                  "$(attribsafe ${REQUEST_URI})" "$(attribsafe $(grep -F "$REQUEST_URI " "$bmfile" |sed -r 's;.*\t;;'))" "$(l10n bm_del)"
+                  "$(attribsafe ${REQUEST_URI})" \
+                  "$(attribsafe $(grep -m1 -F "$REQUEST_URI    " "$bmfile" |sed -r 's;.*\t;;'))" \
+                  "$(l10n bm_del)"
         else
           printf '<input type="hidden" name="bm_url" value="%s" />
                   <input type="text" name="bm_name" placeholder="%s" /