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 f0e3c223c5523a3c40cb47909099bfc2972e9b76..b0a0e53be7cec3c73147ce61fe353aaa9b8a3d69 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -25,7 +25,8 @@ sub getopt () { #{{{
 sub tagpage ($) { #{{{
        my $tag=shift;
                        
 sub tagpage ($) { #{{{
        my $tag=shift;
                        

-       if (exists $config{tagbase} &&
+       if ($tag !~ m{^\.?/} &&
+           exists $config{tagbase} &&

            defined $config{tagbase}) {
                $tag=$config{tagbase}."/".$tag;
        }
            defined $config{tagbase}) {
                $tag=$config{tagbase}."/".$tag;
        }

diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index a2f0c7e5796e36b9819430d9202d1f7884282189..c197ae53f99e6fcda3697cd1fc2e477e62bfa0a4 100644 (file)
--- 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.
 
 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.
 [[!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.