From cc1d7d7a4d9cbcbf604416b7487e4868193d4b75 Mon Sep 17 00:00:00 2001
From: cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Tue, 19 Jan 2010 18:34:01 +0000
Subject: [PATCH] Implement request #2934868: Do not display full redirection
 URL, patch by fnorder@users.sourceforge.net

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@614 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 data/templates/bookmarks.tpl.php | 6 +++---
 doc/ChangeLog                    | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
index b349ab7..c6a87c2 100644
--- a/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@ -296,8 +296,8 @@ if($currenttag!= '') {
 			$rel = ' rel="nofollow"';
 		}
 
-		$address = filter($row['bAddress']);
-
+		$address  = filter($row['bAddress']);
+		$oaddress = $address;
 		// Redirection option
 		if ($GLOBALS['useredir']) {
 			$address = $GLOBALS['url_redir'] . $address;
@@ -344,7 +344,7 @@ if($currenttag!= '') {
 		}
 		echo '<div class="description">'. nl2br($bkDescription) ."</div>\n";
 		//if(!isset($hash)) {
-			echo '<div class="address">'.shortenString($address).'</div>';
+			echo '<div class="address">' . shortenString($oaddress) . '</div>';
 		//}
 
 		echo '<div class="meta">'.  $cats . $copy . $edit . $update ."</div>\n";
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d2336a6..e5022ef 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -11,6 +11,8 @@ ChangeLog for SemantiScuttle
     instead of modification date
 - Fix bug #2887063: Common tag combination description feels broken
 - Fix several SQL injection possibilities
+- Implement request #2934868: Do not display full redirection URL
+  Patch by fnorder@users.sourceforge.net
 
 
 0.95.2 - 2010-01-16