From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 12 Mar 2008 22:49:41 +0000 (-0400)
Subject: * Use absolute url for feedurl when filling out the feed templates.
X-Git-Tag: 2.41~133
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/99c65a4c0e4c563693525e9b7c737a2146418955

* 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 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