Merge remote-tracking branch 'spalax/paternal/libdirs'

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 13dabce0c16cef34b85eab82fcc8c6c9aab2af54..605f415994e73bee121faab9fb7e5e64f1a02182 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -104,6 +104,9 @@ sub gentag ($) {
                else {
                        $tagpage=~s/^\///;
                }
                else {
                        $tagpage=~s/^\///;
                }

+               if (exists $IkiWiki::pagecase{lc $tagpage}) {
+                       $tagpage=$IkiWiki::pagecase{lc $tagpage}
+               }

 
                my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
 
                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) {
        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]);

                }
        }
 }
                }
        }
 }