Merge branch 'ready/tag-test' into transient-tag

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 9897efc08027c958afc89dbd9789c531b09b6ec1..fd5ce1e8a91488ce5d5b20709001fd3d177def97 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -59,11 +59,11 @@ sub taglink ($) {
 sub tagname ($) {
        my $tag=shift;
        if (defined $config{tagbase}) {
-               $tag =~ s!^/$config{tagbase}/!!;
+               $tag =~ s!^/\Q$config{tagbase}\E/!!;
        } else {
-               $tag =~ s!^\.?/?!!;
+               $tag =~ s!^\.?/!!;
        }
-       return $tag;
+       return pagetitle($tag, 1);
 }
 
 sub htmllink_tag ($$$;@) {