Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
eb0ada01e6
1 changed files with 2 additions and 2 deletions
|
@ -913,9 +913,9 @@ function showRSS()
|
||||||
$absurl = htmlspecialchars($link['url']);
|
$absurl = htmlspecialchars($link['url']);
|
||||||
if (startsWith($absurl,'?')) $absurl=$pageaddr.$absurl; // make permalink URL absolute
|
if (startsWith($absurl,'?')) $absurl=$pageaddr.$absurl; // make permalink URL absolute
|
||||||
if ($usepermalinks===true)
|
if ($usepermalinks===true)
|
||||||
echo '<item><title>'.htmlspecialchars($link['title']).'</title><guid>'.$guid.'</guid><link>'.$guid.'</link>';
|
echo '<item><title>'.htmlspecialchars($link['title']).'</title><guid isPermaLink="false">'.$guid.'</guid><link>'.$guid.'</link>';
|
||||||
else
|
else
|
||||||
echo '<item><title>'.htmlspecialchars($link['title']).'</title><guid>'.$guid.'</guid><link>'.$absurl.'</link>';
|
echo '<item><title>'.htmlspecialchars($link['title']).'</title><guid isPermaLink="false">'.$guid.'</guid><link>'.$absurl.'</link>';
|
||||||
if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) echo '<pubDate>'.htmlspecialchars($rfc822date)."</pubDate>\n";
|
if (!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()) echo '<pubDate>'.htmlspecialchars($rfc822date)."</pubDate>\n";
|
||||||
if ($link['tags']!='') // Adding tags to each RSS entry (as mentioned in RSS specification)
|
if ($link['tags']!='') // Adding tags to each RSS entry (as mentioned in RSS specification)
|
||||||
{
|
{
|
||||||
|
|
Reference in a new issue