X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2a60cda1729ead6dd2f13fc40ef1dccec5b30d92..8d4342183b1c3a96797def6fff96feebacb90db6:/IkiWiki/Plugin/tag.pm diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index e4c8a1155..8a0859b5c 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -7,6 +7,7 @@ use strict; use IkiWiki 3.00; sub import { + hook(type => "checkconfig", id => "tag", call => \&checkconfig); hook(type => "getopt", id => "tag", call => \&getopt); hook(type => "getsetup", id => "tag", call => \&getsetup); hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1); @@ -53,6 +54,12 @@ sub getsetup () { }, } +sub checkconfig () { + if (! defined $config{tag_autocreate_commit}) { + $config{tag_autocreate_commit} = 1; + } +} + sub taglink ($) { my $tag=shift; @@ -97,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}); @@ -110,6 +120,7 @@ sub gentag ($) { my $dir = $config{srcdir}; if (! $config{tag_autocreate_commit}) { + no warnings 'once'; $dir = $IkiWiki::Plugin::transient::transientdir; } @@ -189,8 +200,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]); } } }