X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/da371733b53f564ec8dd349009a126552daaf84a..9c4c8000c853a4f218d8a6230f504b6cbea2b8d1:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 13dabce0c..605f41599 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -104,6 +104,9 @@ sub gentag ($) {
 		else {
 			$tagpage=~s/^\///;
 		}
+		if (exists $IkiWiki::pagecase{lc $tagpage}) {
+			$tagpage=$IkiWiki::pagecase{lc $tagpage}
+		}
 
 		my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
@@ -196,8 +199,10 @@ sub pagetemplate (@) {
 	if ($template->query(name => "categories")) {
 		# It's an rss/atom template. Add any categories.
 		if (defined $tags && %$tags) {
-			$template->param(categories => [map { category => tagname($_) },
-				sort keys %$tags]);
+			eval q{use HTML::Entities};
+			$template->param(categories =>
+				[map { category => HTML::Entities::encode_entities_numeric(tagname($_)) },
+					sort keys %$tags]);
 		}
 	}
 }