summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-21 17:05:40 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-21 17:05:40 -0400
commitedfe8693814ef48426dc35fa76cdd145871fbc96 (patch)
treefc144eee7be24a25aa9088e6fe91f941467ffc51
parent652beaf48c64d5dd10cb0e0702f1fb284c96177a (diff)
parent09a5cdbb3401cdcb17f3d2993912a8f0ea8d23b2 (diff)
Merge commit 'smcv/master'
-rw-r--r--IkiWiki/Plugin/tag.pm3
-rw-r--r--doc/plugins/tag.mdwn6
2 files changed, 8 insertions, 1 deletions
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.