summaryrefslogtreecommitdiff
path: root/www/bookmarks.php
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2011-06-27 23:03:31 +0200
committerChristian Weiske <cweiske@cweiske.de>2011-06-27 23:03:31 +0200
commit90b6e65b1193b780c9c363fee3b1e92a5d0fba30 (patch)
treedfa326e2313172d151f4a1b07fd297d0f129c875 /www/bookmarks.php
parent3d11286cbcc3cb35efe11f6e4a4ef5ac81620bda (diff)
downloadsemanticscuttle-90b6e65b1193b780c9c363fee3b1e92a5d0fba30.tar.gz
semanticscuttle-90b6e65b1193b780c9c363fee3b1e92a5d0fba30.tar.bz2
escape feed links properly and fix some bugs in the feed link parameters
Diffstat (limited to 'www/bookmarks.php')
-rw-r--r--www/bookmarks.php20
1 files changed, 15 insertions, 5 deletions
diff --git a/www/bookmarks.php b/www/bookmarks.php
index 7056fa6..72c063e 100644
--- a/www/bookmarks.php
+++ b/www/bookmarks.php
@@ -229,14 +229,14 @@ if ($templatename == 'editbookmark.tpl') {
$tplVars['sidebar_blocks'] = array('watchstatus');
if (!$cat) { //user page without tags
- $rssTitle = ": My Bookmarks";
+ $rssTitle = "My Bookmarks";
$cat = NULL;
$tplVars['currenttag'] = NULL;
//$tplVars['sidebar_blocks'][] = 'menu2';
$tplVars['sidebar_blocks'][] = 'linked';
$tplVars['sidebar_blocks'][] = 'popular';
} else { //pages with tags
- $rssTitle = ": Tags" . $catTitle;
+ $rssTitle = "Tags" . $catTitle;
$rssCat = '/'. filter($cat, 'url');
$tplVars['currenttag'] = $cat;
$tplVars['sidebar_blocks'][] = 'tagactions';
@@ -266,7 +266,11 @@ if ($templatename == 'editbookmark.tpl') {
// Set template vars
$tplVars['rsschannels'] = array(
- array(filter($sitename .$rssTitle), createURL('rss', filter($user, 'url') . $rssCat.'?sort='.getSortOrder()))
+ array(
+ sprintf(T_('%s: %s'), $sitename, $rssTitle),
+ createURL('rss', filter($user, 'url'))
+ . $rssCat . '?sort='.getSortOrder()
+ )
);
if ($userservice->isLoggedOn()) {
@@ -275,8 +279,14 @@ if ($templatename == 'editbookmark.tpl') {
array_push(
$tplVars['rsschannels'],
array(
- filter($sitename . $rssTitle. sprintf(T_(': (private) ')) . $currentUsername),
- createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privateKey='.$currentUser->getPrivateKey())
+ sprintf(
+ T_('%s: %s (+private %s)'),
+ $sitename, $rssTitle, $currentUsername
+ ),
+ createURL('rss', filter($currentUsername, 'url'))
+ . $rssCat
+ . '?sort=' . getSortOrder()
+ . '&privateKey=' . $currentUser->getPrivateKey()
)
);
}