* Change the rss feed title from the wikiname to the page title.

  Overriding the page title with meta title already overrode the rss feed
  tittle.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 075f70399bb46ed6fa8decd708399e606b60a515..8bd09de4017c9d73fc4faee8d28f470e77e07ea1 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -284,7 +284,7 @@ sub genfeed ($$$$@) { #{{{
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);
        $template->param(
-               title => $config{wikiname},
+               title => pagetitle($page),
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,

diff --git a/debian/changelog b/debian/changelog
index 9f41ead38b3b77d890a3931d79509af9bdccc42c..28f6c9e6105ddb77f4be2c238b72e9752d4ddee9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 ikiwiki (1.31) UNRELEASED; urgency=low
 
   * Patch from Pawel Tecza to cp -a the templates in the Makefile.
+  * Change the rss feed title from the wikiname to the page title.
+    Overriding the page title with meta title already overrode the rss feed
+    tittle.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 17 Oct 2006 13:48:26 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 20 Oct 2006 16:53:36 -0400
 
 ikiwiki (1.30) unstable; urgency=low