]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' into autotag
authorJoey Hess <joey@kitenet.net>
Thu, 22 Apr 2010 00:18:44 +0000 (20:18 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 22 Apr 2010 00:19:06 +0000 (20:19 -0400)
Conflicts:
IkiWiki/Plugin/tag.pm

1  2 
IkiWiki/Plugin/tag.pm

index a7f37a5122b30da2a8716200093a98ef3aa6f189,8ec08e936d1b021d69d7ad9f546c3427a425920c..cd7ecc212fd7c928560ade98d34366ae9da45999
@@@ -34,19 -34,12 +34,19 @@@ sub getsetup () 
                        safe => 1,
                        rebuild => 1,
                },
 +              tag_autocreate => {
 +                      type => "boolean",
 +                      example => 0,
 +                      description => "autocreate new tag pages?",
 +                      safe => 1,
 +                      rebuild => undef,
 +              },
  }
  
 -sub tagpage ($) {
 +sub taglink ($) {
        my $tag=shift;
 -                      
 +      
-       if ($tag !~ m{^\.?/} &&
+       if ($tag !~ m{^/} &&
            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;
                $tag=~y#/#/#s; # squash dups