Merge commit 'upstream/master' into prv/po

1 files changed, 2 insertions, 7 deletions

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c4a175677..d725ef9b3 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -44,6 +44,7 @@ sub tagpage ($) { #{{{
 	if ($tag !~ m{^\.?/} &&
 	    defined $config{tagbase}) {
 		$tag="/".$config{tagbase}."/".$tag;
+		$tag=~y#/#/#s; # squash dups
 	}
 
 	return $tag;
@@ -55,13 +56,7 @@ sub taglink ($$$;@) { #{{{
 	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 (@) { #{{{