X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/db3b72c4822cf9057460d47654c35f0a5115139e..72c53650ad4a708493880daa75cdda9d056fc75e:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 6d22c49fd..48ed1a8f8 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 my %tags;
 
@@ -16,6 +16,7 @@ sub import { #{{{
 
 sub getopt () { #{{{
 	eval q{use Getopt::Long};
+	error($@) if $@;
 	Getopt::Long::Configure('pass_through');
 	GetOptions("tagbase=s" => \$config{tagbase});
 } #}}}
@@ -39,10 +40,11 @@ sub preprocess (@) { #{{{
 	my $page = $params{page};
 	delete $params{page};
 	delete $params{destpage};
+	delete $params{preview};
 
-	$tags{$page} = [];
 	foreach my $tag (keys %params) {
-		push @{$tags{$page}}, $tag;
+		$tag=IkiWiki::linkpage($tag);
+		$tags{$page}{$tag}=1;
 		# hidden WikiLink
 		push @{$links{$page}}, tagpage($tag);
 	}
@@ -59,13 +61,14 @@ sub pagetemplate (@) { #{{{
 	$template->param(tags => [
 		map { 
 			link => htmllink($page, $destpage, tagpage($_))
-		}, @{$tags{$page}}
-	]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
+		}, sort keys %{$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 (exists $tags{$page} && @{$tags{$page}}) {
-			$template->param(categories => [map { category => $_ }, @{$tags{$page}}]);
+	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 => $_ },
+				sort keys %{$tags{$page}}]);
 		}
 	}
 } # }}}