diff options
| author | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2008-07-21 22:01:11 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/> | 2008-07-21 22:02:55 +0100 |
| commit | 09a5cdbb3401cdcb17f3d2993912a8f0ea8d23b2 (patch) | |
| tree | 66f0237341f8236d41800baa71ebeacacd8924bc | |
| parent | 8fbe201bb379e46c4285be5c07eb1247a8639d96 (diff) | |
| download | ikiwiki-09a5cdbb3401cdcb17f3d2993912a8f0ea8d23b2.tar ikiwiki-09a5cdbb3401cdcb17f3d2993912a8f0ea8d23b2.tar.gz | |
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.
| -rw-r--r-- | IkiWiki/Plugin/tag.pm | 3 | ||||
| -rw-r--r-- | doc/plugins/tag.mdwn | 6 |
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. |