From 8e9d354af15afcb26c1a56b279f9c03f2fbd75ca Mon Sep 17 00:00:00 2001 From: mensonge Date: Thu, 15 Jan 2009 16:58:14 +0000 Subject: [PATCH] Minor Refactoring: tps) git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@235 b3834d28-1941-0410-a4f8-b48e95affb8f --- templates/bookmarks.tpl.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php index 299dc0a..6203d33 100644 --- a/templates/bookmarks.tpl.php +++ b/templates/bookmarks.tpl.php @@ -8,6 +8,8 @@ $cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService'); $pageName = isset($pageName)?$pageName:""; $user = isset($user)?$user:""; +$currenttag = isset($currenttag)?$currenttag:""; + $this->includeTemplate($GLOBALS['top_include']); @@ -28,12 +30,12 @@ include('search.inc.php');

getLastTagDescription($currenttag)) { +if($currenttag!= '' && $cdservice->getLastTagDescription($currenttag)) { $description = $cdservice->getLastTagDescription($currenttag); echo nl2br(filter($description['cdDescription'])); } elseif(isset($hash) && $cdservice->getLastBookmarkDescription($hash)) { @@ -44,7 +46,7 @@ if(isset($currenttag) && $currenttag!= '' && $cdservice->getLastTagDescription($ //common tag description edit if($userservice->isLoggedOn()) { - if(isset($currenttag) && $currenttag!= '') { + if($currenttag!= '') { echo ' '; echo T_('common description').' '; } elseif(isset($hash)) { @@ -58,7 +60,7 @@ if($userservice->isLoggedOn()) { getUserByUsername($user); if($tagservice->getDescription($currenttag, $userObject['uId'])) { ?> @@ -68,7 +70,7 @@ echo nl2br(filter($description['tDescription'])); //personal tag description edit if($userservice->isLoggedOn()) { - if(isset($currenttag) && $currenttag!= '') { + if($currenttag!= '') { echo ' '; echo T_('personal description').' '; } @@ -98,8 +100,8 @@ if (!isset($hash)) { '; echo T_('Bookmarks from other users for this tag').'';