]> sipb.mit.edu Git - ikiwiki.git/commitdiff
inline: base feed urls on included page name
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Thu, 6 Jan 2011 21:15:14 +0000 (22:15 +0100)
committerJoey Hess <joey@kitenet.net>
Tue, 22 Feb 2011 21:23:08 +0000 (17:23 -0400)
Second (forgotten) half of bb8f76a4a04686def8cc6f21bcca80cb2cc3b2c9.
This ensures that the link URL and page title in the feed are the
correct ones.

IkiWiki/Plugin/inline.pm

index 28507720403f4da7940b2a55d2a72ad357d58664..44e38436c7795c75d9eb5b88f77d706c7a331d35 100644 (file)
@@ -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" />};
                        }