summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-01-06 22:15:14 +0100
committerJoey Hess <joey@kitenet.net>2011-02-22 17:23:08 -0400
commit72c8f01b36c841b0e83a2ad7ad1365b9116075c5 (patch)
tree60db462ddc34346b861e2d7351e7f18e05ed2f89
parentb060e691acfada6868ce8c7d3a6f7787e2470771 (diff)
inline: base feed urls on included page name
Second (forgotten) half of bb8f76a4a04686def8cc6f21bcca80cb2cc3b2c9. This ensures that the link URL and page title in the feed are the correct ones.
-rw-r--r--IkiWiki/Plugin/inline.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 285077204..44e38436c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -440,7 +440,7 @@ sub preprocess_inline (@) {
if (! $params{preview}) {
writefile($rssp, $config{destdir},
genfeed("rss",
- $config{url}."/".$rssp, $desc, $params{guid}, $params{destpage}, @feedlist));
+ $config{url}."/".$rssp, $desc, $params{guid}, $params{page}, @feedlist));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/rss+xml" title="$rssdesc" href="$rssurl" />};
}
@@ -450,7 +450,7 @@ sub preprocess_inline (@) {
will_render($params{destpage}, $atomp);
if (! $params{preview}) {
writefile($atomp, $config{destdir},
- genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{destpage}, @feedlist));
+ genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{page}, @feedlist));
$toping{$params{destpage}}=1 unless $config{rebuild};
$feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/atom+xml" title="$atomdesc" href="$atomurl" />};
}