summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-06-12 22:43:34 -0400
committerJoey Hess <joey@kitenet.net>2010-06-12 22:43:34 -0400
commitdccd76487151acc6adc93ec79f1808096bc41324 (patch)
tree2bd59c215be163a1730ca46a866e24f1cb511837 /IkiWiki/Plugin
parentc225cdad2524a12b998e550b6c0ba7079d164cff (diff)
edittemplate: Look for template pages under templates/ like everything else (still looks in old location for backwards compatability).
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/edittemplate.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 742413c94..226f83bb4 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -56,10 +56,15 @@ sub preprocess (@) {
}
my $link=linkpage($params{template});
+ add_depends($params{page}, $link, deptype("presence"));
my $bestlink=bestlink($params{page}, $link);
+ if (! length $bestlink) {
+ add_depends($params{page}, "templates/$link", deptype("presence"));
+ $link="/templates/".$link;
+ $bestlink=bestlink($params{page}, $link);
+ }
$pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
- add_depends($params{page}, $link, deptype("presence"));
return "" if ($params{silent} && IkiWiki::yesno($params{silent})) &&
length $bestlink;
return sprintf(gettext("edittemplate %s registered for %s"),