X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/39056453424dcb7e01f69c502192e45604d1fe84..339478ba4737d77b5e03a3489c3f1f78b7af147d:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 74d187cd2..c4a175677 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -42,14 +42,28 @@ sub tagpage ($) { #{{{
 	my $tag=shift;
 			
 	if ($tag !~ m{^\.?/} &&
-	    exists $config{tagbase} &&
 	    defined $config{tagbase}) {
-		$tag=$config{tagbase}."/".$tag;
+		$tag="/".$config{tagbase}."/".$tag;
 	}
 
 	return $tag;
 } #}}}
 
+sub taglink ($$$;@) { #{{{
+	my $page=shift;
+	my $destpage=shift;
+	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);
+} #}}}
+
 sub preprocess_tag (@) { #{{{
 	if (! @_) {
 		return "";
@@ -61,7 +75,7 @@ sub preprocess_tag (@) { #{{{
 	delete $params{preview};
 
 	foreach my $tag (keys %params) {
-		$tag=IkiWiki::linkpage($tag);
+		$tag=linkpage($tag);
 		$tags{$page}{$tag}=1;
 		# hidden WikiLink
 		push @{$links{$page}}, tagpage($tag);
@@ -77,19 +91,17 @@ sub preprocess_taglink (@) { #{{{
 	my %params=@_;
 	return join(" ", map {
 		if (/(.*)\|(.*)/) {
-			my $tag=IkiWiki::linkpage($2);
+			my $tag=linkpage($2);
 			$tags{$params{page}}{$tag}=1;
 			push @{$links{$params{page}}}, tagpage($tag);
-			return htmllink($params{page}, $params{destpage},
-				tagpage($tag),
-				linktext => IkiWiki::pagetitle($1));
+			return taglink($params{page}, $params{destpage}, $tag,
+				linktext => pagetitle($1));
 		}
 		else {
-			my $tag=IkiWiki::linkpage($_);
+			my $tag=linkpage($_);
 			$tags{$params{page}}{$tag}=1;
 			push @{$links{$params{page}}}, tagpage($tag);
-			return htmllink($params{page}, $params{destpage},
-				tagpage($tag));
+			return taglink($params{page}, $params{destpage}, $tag);
 		}
 	}
 	grep {
@@ -105,8 +117,7 @@ sub pagetemplate (@) { #{{{
 
 	$template->param(tags => [
 		map { 
-			link => htmllink($page, $destpage, tagpage($_),
-					rel => "tag")
+			link => taglink($page, $destpage, $_, rel => "tag")
 		}, sort keys %{$tags{$page}}
 	]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");