* Fix missing categories in rss/atom feeds.

[ikiwiki.git] / IkiWiki / Plugin / tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 7a1be6bec6b983c1ec8abb332d9a197df08a26cc..29d1d030a2e328088feb1244d98e934b226dc227 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -10,12 +10,13 @@ my %tags;
 
 sub import { #{{{
        hook(type => "getopt", id => "tag", call => \&getopt);
-       hook(type => "preprocess", id => "tag", call => \&preprocess);
+       hook(type => "preprocess", id => "tag", call => \&preprocess, scan => 1);
        hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
 } # }}}
 
 sub getopt () { #{{{
        eval q{use Getopt::Long};
+       error($@) if $@;
        Getopt::Long::Configure('pass_through');
        GetOptions("tagbase=s" => \$config{tagbase});
 } #}}}
@@ -62,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}}]);
                }