inline: Use the feed's description in the rss and atom links. Closes: #502113

master
Joey Hess 2008-10-15 14:45:28 -04:00
parent 02e39bf704
commit b8f4b9c799
2 changed files with 4 additions and 2 deletions

View File

@ -376,7 +376,7 @@ sub preprocess_inline (@) { #{{{
genfeed("rss",
$config{url}."/".$rssp, $desc, $params{guid}, $params{destpage}, @feedlist));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="$desc (RSS)" href="$rssurl" />};
}
}
if ($atom) {
@ -386,7 +386,7 @@ sub preprocess_inline (@) { #{{{
writefile($atomp, $config{destdir},
genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{destpage}, @feedlist));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="$desc (Atom)" href="$atomurl" />};
}
}
}

2
debian/changelog vendored
View File

@ -11,6 +11,8 @@ ikiwiki (2.67) UNRELEASED; urgency=low
* Pass HTTPS variable through the wrapper so that CGI->https can be used
by plugins. Closes: #502047
* inline: Allow MTIME to be used in inlinepage.tmpl.
* inline: Use the feed's description in the rss and atom links.
Closes: #502113
-- Joey Hess <joeyh@debian.org> Mon, 06 Oct 2008 16:07:50 -0400