From 9bfdcd3c2a371507df7b6cea6509ab45d7f02424 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Fri, 19 Aug 2011 19:16:45 +0200
Subject: [PATCH] Fix bug #3388219: Incorrect URL when cancelling
 tag2tag-actions

---
 doc/ChangeLog         | 1 +
 www/tag2tagadd.php    | 2 +-
 www/tag2tagdelete.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0d3563c..7e3a064 100644
--- 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 d660451..3f4af8c 100644
--- 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 c1e52cd..06fea98 100644
--- 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());