* Fix missing categories in rss/atom feeds.

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index ddb67c2a8b5ad52f24c76cd1ff512c27466232e4..29d1d030a2e328088feb1244d98e934b226dc227 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -63,8 +63,8 @@ sub pagetemplate (@) { #{{{
                }, @{$tags{$page}}
        ]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
 
-       if ($template->query(name => "pubdate")) {
-               # It's an rss template. Add any categories.
+       if ($template->query(name => "categories")) {
+               # It's an rss/atom template. Add any categories.
                if (exists $tags{$page} && @{$tags{$page}}) {
                        $template->param(categories => [map { category => $_ }, @{$tags{$page}}]);
                }

diff --git a/debian/changelog b/debian/changelog
index eff7becb7131c9eebaeacd300a84cbee36f1fe0b..e8201bfc4fa89c2317fda72b1c03b135b870393d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.40) UNRELEASED; urgency=low
+
+  * Fix missing categories in rss/atom feeds.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 14 Jan 2007 15:09:49 -0500
+
 ikiwiki (1.39) unstable; urgency=low
 
   * Add a rawhtml plugin that allows copying raw html files from the srcdir.

diff --git a/doc/bugs/No_categories_in_RSS__47__Atom_feeds.mdwn b/doc/bugs/No_categories_in_RSS__47__Atom_feeds.mdwn
index 90a5a38a18d7f7bbed69265b9a190f19400a2d86..cb9c2612e1bfa623142d3a09f4c104e3189d00ba 100644 (file)
--- a/doc/bugs/No_categories_in_RSS__47__Atom_feeds.mdwn
+++ b/doc/bugs/No_categories_in_RSS__47__Atom_feeds.mdwn
@@ -2,4 +2,6 @@ RSS and Atom feeds don't have any categories listed in them, even though the
 templates have a loop for the categories (I'm assuming that it's the tags 
 that it's supposed to be looping through?).
 
-The tags are showing up as expected in the HTML output, just not any feeds.
\ No newline at end of file
+The tags are showing up as expected in the HTML output, just not any feeds.
+
+> Yurk! [[bugs/done]] --[[Joey]]