diff options
author | Christian Weiske <cweiske@cweiske.de> | 2012-01-20 22:10:30 +0100 |
---|---|---|
committer | Christian Weiske <cweiske@cweiske.de> | 2012-01-20 22:10:30 +0100 |
commit | 6ff4370a20e7da8d02239b387cc0db296d7bf466 (patch) | |
tree | 0166e5a7b78779675507086326efd67b4fef9eb3 /www/rss.php | |
parent | d16ca9235157042604f23949f2fa6e479e882d7d (diff) | |
parent | d6d44c6cfa7e3e5cdb36d9e4abd3a62edad74eb9 (diff) | |
download | semanticscuttle-6ff4370a20e7da8d02239b387cc0db296d7bf466.tar.gz semanticscuttle-6ff4370a20e7da8d02239b387cc0db296d7bf466.tar.bz2 |
Merge branch '0.98'
Diffstat (limited to 'www/rss.php')
-rw-r--r-- | www/rss.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/www/rss.php b/www/rss.php index d888726..1f88944 100644 --- a/www/rss.php +++ b/www/rss.php @@ -124,7 +124,8 @@ if ($cat) { } $tplVars['feedtitle'] = filter($GLOBALS['sitename'] . (isset($pagetitle) ? $pagetitle : '')); -$tplVars['feedlink'] = ROOT; +$tplVars['pagelink'] = addProtocolToUrl(ROOT); +$tplVars['feedlink'] = addProtocolToUrl(ROOT) . 'rss?sort=' . getSortOrder(); $tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']); $bookmarks = $bookmarkservice->getBookmarks( @@ -137,6 +138,7 @@ $bookmarks_tmp = filter($bookmarks['bookmarks']); $bookmarks_tpl = array(); $latestdate = null; +$guidBaseUrl = addProtocolToUrl(ROOT) . '#'; foreach ($bookmarks_tmp as $key => $row) { $_link = $row['bAddress']; // Redirection option @@ -154,7 +156,8 @@ foreach ($bookmarks_tmp as $key => $row) { 'description' => $row['bDescription'], 'creator' => SemanticScuttle_Model_UserArray::getName($row), 'pubdate' => $_pubdate, - 'tags' => $row['tags'] + 'tags' => $row['tags'], + 'guid' => $guidBaseUrl . $row['bId'], ); } unset($bookmarks_tmp); |