X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/789e68a8b1a451133d9308ecd800140e2ed6f626..062ed44f47d61c3bbbf2e8a7944a9b4e423b735a:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 72ae682f3..62f030f4e 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -36,7 +36,7 @@ sub getsetup () {
 		},
 		tag_autocreate => {
 			type => "boolean",
-			example => 0,
+			example => 1,
 			description => "autocreate new tag pages?",
 			safe => 1,
 			rebuild => undef,
@@ -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
@@ -67,7 +67,8 @@ sub htmllink_tag ($$$;@) {
 sub gentag ($) {
 	my $tag=shift;
 
-	if ($config{tag_autocreate}) {
+	if ($config{tag_autocreate} ||
+	    ($config{tagbase} && ! defined $config{tag_autocreate})) {
 		my $tagpage=taglink($tag);
 		if ($tagpage=~/^\.\/(.*)/) {
 			$tagpage=$1;
@@ -79,12 +80,12 @@ sub gentag ($) {
 		my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
 		add_autofile($tagfile, "tag", sub {
-			my $message=sprintf(gettext("creating tag page %s"), $tag);
+			my $message=sprintf(gettext("creating tag page %s"), $tagpage);
 			debug($message);
 
 			my $template=template("autotag.tmpl");
-			$template->param(tag => IkiWiki::basename($tag));
-			$template->param(tagpage => $tagpage);
+			$template->param(tagname => IkiWiki::basename($tag));
+			$template->param(tag => $tag);
 			writefile($tagfile, $config{srcdir}, $template->output);
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
@@ -170,8 +171,8 @@ package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
 	my $page=shift;
-	my $glob=shift;
-	return match_link($page, IkiWiki::Plugin::tag::taglink($glob), linktype => 'tag', @_);
+	my $glob=IkiWiki::Plugin::tag::taglink(shift);
+	return match_link($page, $glob, linktype => 'tag', @_);
 }
 
 1