summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki.pm11
-rw-r--r--IkiWiki/Plugin/tag.pm5
2 files changed, 10 insertions, 6 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 90e623330..56c491339 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1897,9 +1897,14 @@ sub add_link ($$) {
}
sub add_autofile ($) {
- my $addfile=shift;
- my ($file,$page) = verify_src_file($addfile,$config{srcdir});
- if ($page) {
+ my $autofile=shift;
+
+ if (srcfile($autofile, 1)) {
+ return 0;
+ }
+
+ my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
+ if (defined $file) {
push @autofiles, $file;
}
}
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c0b7feb23..c6c99ae45 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -71,15 +71,14 @@ sub gentag ($) {
if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
$tagfile=~s/^\///;
- return if (srcfile($tagfile,1));
+
+ return if (! add_autofile($tagfile));
debug(sprintf(gettext("creating tag page %s"), $tag));
my $template=template("autotag.tmpl");
$template->param(tag => $tag);
writefile($tagfile, $config{srcdir}, $template->output);
-
- add_autofile("$config{srcdir}/$tagfile");
}
}