diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-03-12 18:49:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-03-12 18:49:41 -0400 |
| commit | 99c65a4c0e4c563693525e9b7c737a2146418955 (patch) | |
| tree | 784b88e9bfc6ab1429b3a0b73c44c203c698929d | |
| parent | 862ca19eb1aee87e4ac05e8a5a9b326dd32dfe5d (diff) | |
| download | ikiwiki-99c65a4c0e4c563693525e9b7c737a2146418955.tar ikiwiki-99c65a4c0e4c563693525e9b7c737a2146418955.tar.gz | |
* Use absolute url for feedurl when filling out the feed templates.
Closes: #470530
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index f4a20e489..c7107d664 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -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" />}; } diff --git a/debian/changelog b/debian/changelog index d05fa8f30..0a0151826 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |