From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 20 Oct 2006 21:17:36 +0000 (+0000)
Subject: * Change the rss feed title from the wikiname to the page title.
X-Git-Tag: 1.31~36
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/182748a9c199ea64131984d7476be741dc6dd8bb
* 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 075f70399..8bd09de40 100644
--- 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 9f41ead38..28f6c9e61 100644
--- 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