summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2011-08-18 16:18:28 +0200
committerChristian Weiske <cweiske@cweiske.de>2011-08-18 16:18:28 +0200
commit1b984c4e4e7d51541e0a448a7edb77a69bb1a3aa (patch)
treed3e86bace18e2a4c19c22359762231e19c37ce4c
parent880b94498ab07edc0990af183c2491b89eefe066 (diff)
downloadsemanticscuttle-1b984c4e4e7d51541e0a448a7edb77a69bb1a3aa.tar.gz
semanticscuttle-1b984c4e4e7d51541e0a448a7edb77a69bb1a3aa.tar.bz2
revise bugfix of unescaped subtitle
-rw-r--r--data/templates/default/top.inc.php6
-rw-r--r--www/bookmarks.php2
-rw-r--r--www/tags.php2
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'];