diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-21 20:18:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-21 20:19:06 -0400 |
| commit | 20052f888277f270ab846bf8b1eb44714c1009d6 (patch) | |
| tree | 69f991c3815b5187d8d123bf8fd3fbd85fb5ced0 | |
| parent | 752ccf8b48bab173839b5c7892e9868ee71846f0 (diff) | |
| parent | 129cd00bdb03e32df8645b12138cb4c79952775e (diff) | |
| download | ikiwiki-20052f888277f270ab846bf8b1eb44714c1009d6.tar ikiwiki-20052f888277f270ab846bf8b1eb44714c1009d6.tar.gz | |
Merge branch 'master' into autotag
Conflicts:
IkiWiki/Plugin/tag.pm
| -rw-r--r-- | IkiWiki/Plugin/tag.pm | 2 | ||||
| -rw-r--r-- | doc/ikiwiki/directive/tag.mdwn | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index a7f37a512..cd7ecc212 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -46,7 +46,7 @@ sub getsetup () { sub taglink ($) { my $tag=shift; - if ($tag !~ m{^\.?/} && + if ($tag !~ m{^/} && defined $config{tagbase}) { $tag="/".$config{tagbase}."/".$tag; $tag=~y#/#/#s; # squash dups diff --git a/doc/ikiwiki/directive/tag.mdwn b/doc/ikiwiki/directive/tag.mdwn index 64736f8cd..807a96f25 100644 --- a/doc/ikiwiki/directive/tag.mdwn +++ b/doc/ikiwiki/directive/tag.mdwn @@ -28,7 +28,7 @@ into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is If you want to override the tagbase for a particular tag, you can use something like this: - \[[!tag ./foo]] + \[[!tag /foo]] \[[!taglink /foo]] [[!meta robots="noindex, follow"]] |