From e1c0576029f2f87b77887fe499c700ca8974ae9b Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 14 Jan 2007 20:14:36 +0000
Subject: [PATCH] * Fix missing categories in rss/atom feeds.
---
IkiWiki/Plugin/tag.pm | 4 ++--
debian/changelog | 6 ++++++
doc/bugs/No_categories_in_RSS__47__Atom_feeds.mdwn | 4 +++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index ddb67c2a8..29d1d030a 100644
--- 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 eff7becb7..e8201bfc4 100644
--- 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 90a5a38a1..cb9c2612e 100644
--- 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]]
--
2.39.5