From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:18:44 +0000 (-0400)
Subject: Merge branch 'master' into autotag
X-Git-Tag: 3.20100427~62^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20052f888277f270ab846bf8b1eb44714c1009d6;p=ikiwiki.git

Merge branch 'master' into autotag

Conflicts:
	IkiWiki/Plugin/tag.pm
---

20052f888277f270ab846bf8b1eb44714c1009d6
diff --cc IkiWiki/Plugin/tag.pm
index a7f37a512,8ec08e936..cd7ecc212
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@@ -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