From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 21 Jul 2008 21:01:11 +0000 (+0100)
Subject: Don't prepend tagbase to tags if they start with "./" or "/".
X-Git-Tag: 2.55~61^2~27^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=09a5cdbb3401cdcb17f3d2993912a8f0ea8d23b2;p=ikiwiki.git

Don't prepend tagbase to tags if they start with "./" or "/".

That syntax made little sense previously, and this allows sites to put
"most" of their tags under $tagbase.
---

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index f0e3c223c..b0a0e53be 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -25,7 +25,8 @@ sub getopt () { #{{{
 sub tagpage ($) { #{{{
 	my $tag=shift;
 			
-	if (exists $config{tagbase} &&
+	if ($tag !~ m{^\.?/} &&
+	    exists $config{tagbase} &&
 	    defined $config{tagbase}) {
 		$tag=$config{tagbase}."/".$tag;
 	}
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index a2f0c7e57..c197ae53f 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -24,6 +24,12 @@ tags/tech, tags/life, and tags/linux. This is a useful way to avoid
 having to write the full path to tags, if you want to keep them grouped
 together out of the way.
 
+If you want to override the tagbase for a particular tag, you can use
+something like this:
+
+	\[[!tag ./foo]]
+	\[[!taglink /foo]]
+
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
 page is tagged with the "tags" tag.