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

  Closes: #470530

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index f4a20e48967954910f2fd19d281146c1ec379e04..c7107d6645504c7939c37df2b5ab8caebcabb445 100644 (file)
--- 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 d05fa8f30e362e1b412be6570324a2d0085d9568..0a015182633bb95e02331cd7bf685c971e6f48d6 100644 (file)
--- 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