Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0d3563c73cd5325f4674d8412da99e9aa3882064..7e3a064e7c5383a4f8a0df7fb228401665b2241e 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -8,6 +8,7 @@ ChangeLog for SemantiScuttle
 - Fix bug: URLs were escaped too often in bookmark list
 - Fix bug: Subtitle was not escaped
 - Fix bug #3393951: Logo images missing on bookmark page
+- Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions
 
 
 0.98.3 - 2011-08-09

diff --git a/www/tag2tagadd.php b/www/tag2tagadd.php
index d6604518e27ed9dc3c78a35839077098f81b4b78..3f4af8c3af53376fd3538ee60d92b62fd01a414c 100644 (file)
--- a/www/tag2tagadd.php
+++ b/www/tag2tagadd.php
@@ -59,7 +59,7 @@ if (POST_CONFIRM != '') {
         exit();
     }
 } elseif (POST_CANCEL) {
-    header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
+    header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag1));
 }
 
 $tplVars['links']      = $tag2tagservice->getLinks($currentUser->getId());

diff --git a/www/tag2tagdelete.php b/www/tag2tagdelete.php
index c1e52cd372d71b26494f401b5fa0773e25b61be2..06fea9804f14380a1c04fbb1eece39ffa3047925 100644 (file)
--- a/www/tag2tagdelete.php
+++ b/www/tag2tagdelete.php
@@ -71,7 +71,7 @@ if (POST_CONFIRM) {
                exit();
        }
 } elseif (POST_CANCEL) {
-       header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
+       header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag1));
 }
 
 $tplVars['links']      = $tag2tagservice->getLinks($currentUser->getId());