* Use absolute url for feedurl when filling out the feed templates.

Closes: #470530
master
Joey Hess 2008-03-12 18:49:41 -04:00
parent 862ca19eb1
commit 99c65a4c0e
2 changed files with 5 additions and 2 deletions

View File

@ -286,7 +286,8 @@ sub preprocess_inline (@) { #{{{
will_render($params{destpage}, $rssp);
if (! $params{preview}) {
writefile($rssp, $config{destdir},
genfeed("rss", $rssurl, $desc, $params{destpage}, @list));
genfeed("rss",
$config{url}."/".rsspage($params{destpage}).$feednum, $desc, $params{destpage}, @list));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
}
@ -296,7 +297,7 @@ sub preprocess_inline (@) { #{{{
will_render($params{destpage}, $atomp);
if (! $params{preview}) {
writefile($atomp, $config{destdir},
genfeed("atom", $atomurl, $desc, $params{destpage}, @list));
genfeed("atom", $config{url}."/".atompage($params{destpage}).$feednum, $desc, $params{destpage}, @list));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
}

2
debian/changelog vendored
View File

@ -35,6 +35,8 @@ ikiwiki (2.41) UNRELEASED; urgency=low
set to the destination page. This avoids need for hacks to munge the urls
in preview mode, which fixes several bugs.
* Several destpage fixes in plugins.
* Use absolute url for feedurl when filling out the feed templates.
Closes: #470530
-- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100