aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fully fix bug #3463481: use proper self URL, different page url

Browse source
This commit is contained in:
Christian Weiske 2012-01-20 15:03:29 +01:00
parent 87f495d31b
commit f8b7d0243c
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/templates/default/rss.tpl.php
View file

@ -6,7 +6,7 @@ echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n";
> >
<channel> <channel>
<title><?php echo $feedtitle; ?></title> <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); ?>"/> <atom:link rel="self" type="application/rss+xml" href="<?php echo htmlspecialchars($feedlink); ?>"/>
<description><?php echo htmlspecialchars($feeddescription); ?></description> <description><?php echo htmlspecialchars($feeddescription); ?></description>
<pubDate><?php echo date('r'); ?></pubDate> <pubDate><?php echo date('r'); ?></pubDate>

1
doc/ChangeLog
View file

@ -13,6 +13,7 @@ ChangeLog for SemantiScuttle
- Fix bug #3407728: Can't delete users from admin page - Fix bug #3407728: Can't delete users from admin page
- Fix bug #3431742: open_basedir problems with /etc/ config files - Fix bug #3431742: open_basedir problems with /etc/ config files
- Fix bug #3436624: Wrong URL for Delicious API when importing - 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 request #3403609: fr_CA translation update
- Implement patch #3476011: PostgreSQL tables can not be initialized - Implement patch #3476011: PostgreSQL tables can not be initialized
(Frédéric Fauberteau [triaxx]) (Frédéric Fauberteau [triaxx])

3
www/rss.php
View file

@ -124,7 +124,8 @@ if ($cat) {
} }
$tplVars['feedtitle'] = filter($GLOBALS['sitename'] . (isset($pagetitle) ? $pagetitle : '')); $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']); $tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']);
$bookmarks = $bookmarkservice->getBookmarks( $bookmarks = $bookmarkservice->getBookmarks(