Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 7977bbcf567887e63a66f8487bf327cdf5419e0c..d725ef9b3a948f3b5967f66d5ac6dde887a1f633 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -56,13 +56,7 @@ sub taglink ($$$;@) { #{{{
        my $tag=shift;
        my %opts=@_;
 
        my $tag=shift;
        my %opts=@_;
 

-       my $link=tagpage($tag);
-
-       # Force tag creation links to create the tag under /tagbase,
-       # if there is a tagbase and this tag used it.
-       $link="/".$link if $tag ne $link;
-
-       return htmllink($page, $destpage, $link, %opts);
+       return htmllink($page, $destpage, tagpage($tag), %opts);

 } #}}}
 
 sub preprocess_tag (@) { #{{{
 } #}}}
 
 sub preprocess_tag (@) { #{{{