inline: Only the last feed link was put on the page, fix this to include all feed...

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 6d88c2f15c46215f86687f5ea91eb8c9dd3e643e..1b1ca2ce22a8f2562a5977fda88cb7c41b2ea57f 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -376,7 +376,7 @@ sub preprocess_inline (@) { #{{{
                                        genfeed("rss",
                                                $config{url}."/".$rssp, $desc, $params{guid}, $params{destpage}, @feedlist));
                                $toping{$params{destpage}}=1 unless $config{rebuild};
-                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="$desc (RSS)" href="$rssurl" />};
+                               $feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/rss+xml" title="$desc (RSS)" href="$rssurl" />};
                        }
                }
                if ($atom) {
@@ -386,7 +386,7 @@ sub preprocess_inline (@) { #{{{
                                writefile($atomp, $config{destdir},
                                        genfeed("atom", $config{url}."/".$atomp, $desc, $params{guid}, $params{destpage}, @feedlist));
                                $toping{$params{destpage}}=1 unless $config{rebuild};
-                               $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="$desc (Atom)" href="$atomurl" />};
+                               $feedlinks{$params{destpage}}.=qq{<link rel="alternate" type="application/atom+xml" title="$desc (Atom)" href="$atomurl" />};
                        }
                }
        }

diff --git a/debian/changelog b/debian/changelog
index e5379930686dad8c26557b15cf7937ab9984de73..42c8a52e9164c9f513d8ee0c09196ab902b48afa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Use the pure perl Data::Dumper when generating setup files to ensure that
     utf-8 characters are written out as such, and not as the encoded perl
     strings the C Data::Dumper produces.
+  * inline: Only the last feed link was put on the page, fix this to include
+    all feed links. So rss will be included along with atom, and pages with
+    multiple feeds will get links added for all feeds.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400