summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-04-21 20:18:44 -0400
committerJoey Hess <joey@kitenet.net>2010-04-21 20:19:06 -0400
commit20052f888277f270ab846bf8b1eb44714c1009d6 (patch)
tree69f991c3815b5187d8d123bf8fd3fbd85fb5ced0 /IkiWiki/Plugin
parent752ccf8b48bab173839b5c7892e9868ee71846f0 (diff)
parent129cd00bdb03e32df8645b12138cb4c79952775e (diff)
Merge branch 'master' into autotag
Conflicts: IkiWiki/Plugin/tag.pm
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/tag.pm2
1 files changed, 1 insertions, 1 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