summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2012-01-20 15:03:29 +0100
committerChristian Weiske <cweiske@cweiske.de>2012-01-20 15:03:29 +0100
commitf8b7d0243ca17506aeda80f2f0e3608b382da6aa (patch)
treef9377ef57f84eab03b098e59174e4fbd8b60813a
parent87f495d31b8f40375a6a1bf05a6d2bc9860029c3 (diff)
downloadsemanticscuttle-f8b7d0243ca17506aeda80f2f0e3608b382da6aa.tar.gz
semanticscuttle-f8b7d0243ca17506aeda80f2f0e3608b382da6aa.tar.bz2
Fully fix bug #3463481: use proper self URL, different page url
-rw-r--r--data/templates/default/rss.tpl.php2
-rw-r--r--doc/ChangeLog1
-rw-r--r--www/rss.php3
3 files changed, 4 insertions, 2 deletions
diff --git a/data/templates/default/rss.tpl.php b/data/templates/default/rss.tpl.php
index fd5bdbf..4aba277 100644
--- a/data/templates/default/rss.tpl.php
+++ b/data/templates/default/rss.tpl.php
@@ -6,7 +6,7 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n";
>
<channel>
<title><?php echo $feedtitle; ?></title>
- <link><?php echo htmlspecialchars($feedlink); ?></link>
+ <link><?php echo htmlspecialchars($pagelink); ?></link>
<atom:link rel="self" type="application/rss+xml" href="<?php echo htmlspecialchars($feedlink); ?>"/>
<description><?php echo htmlspecialchars($feeddescription); ?></description>
<pubDate><?php echo date('r'); ?></pubDate>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 67da85e..d52787c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -13,6 +13,7 @@ ChangeLog for SemantiScuttle
- Fix bug #3407728: Can't delete users from admin page
- Fix bug #3431742: open_basedir problems with /etc/ config files
- Fix bug #3436624: Wrong URL for Delicious API when importing
+- Fix bug #3463481: RSS feed show warnings in feedvalidator.org
- Implement request #3403609: fr_CA translation update
- Implement patch #3476011: PostgreSQL tables can not be initialized
(Frédéric Fauberteau [triaxx])
diff --git a/www/rss.php b/www/rss.php
index 3628a2e..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'] = addProtocolToUrl(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(