revise bugfix of unescaped subtitle

This commit is contained in:
Christian Weiske 2011-08-18 16:18:28 +02:00
parent 880b94498a
commit 1b984c4e4e
3 changed files with 6 additions and 4 deletions

View file

@ -48,8 +48,10 @@ if(!isset($_GET['popup'])) {
?></div> ?></div>
<?php <?php
if (isset($subtitle)) { if (isset($subtitlehtml)) {
echo '<h2>'. htmlspecialchars($subtitle) ."</h2>\n"; echo '<h2>' . $subtitlehtml . "</h2>\n";
} else if (isset($subtitle)) {
echo '<h2>' . htmlspecialchars($subtitle) . "</h2>\n";
} }
if(DEBUG_MODE) { 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"; 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";

View file

@ -303,7 +303,7 @@ if ($templatename == 'editbookmark.tpl') {
$tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s'); $tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s');
if ($userservice->isLoggedOn() && $user == $currentUsername) { if ($userservice->isLoggedOn() && $user == $currentUsername) {
$tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle; $tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle;
$tplVars['subtitle'] = T_('My Bookmarks') . $catTitleWithUrls; $tplVars['subtitlehtml'] = T_('My Bookmarks') . $catTitleWithUrls;
} else { } else {
$tplVars['pagetitle'] = $user.': '.$cat; $tplVars['pagetitle'] = $user.': '.$cat;
$tplVars['subtitle'] = $pagetitle; $tplVars['subtitle'] = $pagetitle;

View file

@ -107,7 +107,7 @@ $tplVars['start'] = $start;
$tplVars['popCount'] = 25; $tplVars['popCount'] = 25;
$tplVars['currenttag'] = $cat; $tplVars['currenttag'] = $cat;
$tplVars['sidebar_blocks'] = array('linked', 'related', 'menu2');//array('linked', 'related', 'popular'); $tplVars['sidebar_blocks'] = array('linked', 'related', 'menu2');//array('linked', 'related', 'popular');
$tplVars['subtitle'] = $pagetitle; $tplVars['subtitlehtml'] = $pagetitle;
$tplVars['bookmarkCount'] = $start + 1; $tplVars['bookmarkCount'] = $start + 1;
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder()); $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder());
$tplVars['total'] = $bookmarks['total']; $tplVars['total'] = $bookmarks['total'];