revise bugfix of unescaped subtitle

diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php
index f2adba4b647d3be7a3575c0396314c951ed4aa3e..240e5b246e007d5d60dd8624b8754d749402e17d 100644 (file)
--- 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 72c063e6bfb81ebaa1091de89862fe1fda5097f8..54daed207c95485ae25e5371d6ec0b0ac510ab2a 100644 (file)
--- 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 127f6c5a8b2d84d48aad7dccd1a569de9ea375eb..c56b97fd35a3466803db54abbf0ce7039e874269 100644 (file)
--- 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'];