From 7a82f3ef2da0da3d49ae5d013734c29fdcdfe728 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Thu, 18 Aug 2011 16:18:28 +0200
Subject: revise bugfix of unescaped subtitle

---
 data/templates/default/top.inc.php | 6 ++++--
 www/bookmarks.php                  | 2 +-
 www/tags.php                       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php
index f2adba4..240e5b2 100644
--- a/data/templates/default/top.inc.php
+++ b/data/templates/default/top.inc.php
@@ -48,8 +48,10 @@ if(!isset($_GET['popup'])) {
 ?></div>
 
 <?php
-if (isset($subtitle)) {
-	echo '<h2>'. htmlspecialchars($subtitle) ."</h2>\n";
+if (isset($subtitlehtml)) {
+	echo '<h2>' . $subtitlehtml . "</h2>\n";
+} else if (isset($subtitle)) {
+      echo '<h2>' . htmlspecialchars($subtitle) . "</h2>\n";
 }
 if(DEBUG_MODE) {
 	echo '<p class="error">'. T_('Admins, your installation is in "Debug Mode" ($debugMode = true). To go in "Normal Mode" and hide debugging messages, change $debugMode to false into config.php.') ."</p>\n";
diff --git a/www/bookmarks.php b/www/bookmarks.php
index 72c063e..54daed2 100644
--- a/www/bookmarks.php
+++ b/www/bookmarks.php
@@ -303,7 +303,7 @@ if ($templatename == 'editbookmark.tpl') {
 	$tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s');
 	if ($userservice->isLoggedOn() && $user == $currentUsername) {
 		$tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle;
-		$tplVars['subtitle'] =  T_('My Bookmarks') . $catTitleWithUrls;
+		$tplVars['subtitlehtml'] =  T_('My Bookmarks') . $catTitleWithUrls;
 	} else {
 		$tplVars['pagetitle'] = $user.': '.$cat;
 		$tplVars['subtitle'] = $pagetitle;
diff --git a/www/tags.php b/www/tags.php
index 127f6c5..c56b97f 100644
--- a/www/tags.php
+++ b/www/tags.php
@@ -107,7 +107,7 @@ $tplVars['start'] = $start;
 $tplVars['popCount'] = 25;
 $tplVars['currenttag'] = $cat;
 $tplVars['sidebar_blocks'] = array('linked', 'related', 'menu2');//array('linked', 'related', 'popular');
-$tplVars['subtitle'] = $pagetitle;
+$tplVars['subtitlehtml'] = $pagetitle;
 $tplVars['bookmarkCount'] = $start + 1;
 $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder());
 $tplVars['total'] = $bookmarks['total'];
-- 
cgit v1.2.3-54-g00ecf