revise bugfix of unescaped subtitle
This commit is contained in:
parent
000daf70ca
commit
7a82f3ef2d
3 changed files with 6 additions and 4 deletions
|
@ -48,7 +48,9 @@ if(!isset($_GET['popup'])) {
|
|||
?></div>
|
||||
|
||||
<?php
|
||||
if (isset($subtitle)) {
|
||||
if (isset($subtitlehtml)) {
|
||||
echo '<h2>' . $subtitlehtml . "</h2>\n";
|
||||
} else if (isset($subtitle)) {
|
||||
echo '<h2>' . htmlspecialchars($subtitle) . "</h2>\n";
|
||||
}
|
||||
if(DEBUG_MODE) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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'];
|
||||
|
|
Loading…
Reference in a new issue