X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/39d4bfde6b9c49f0a8b13699be701bda11eb851a..58a0698d921efe0daa932599515f6b41b2da4044:/IkiWiki/Plugin/edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index d65072010..576c94be4 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -41,6 +41,8 @@ sub needsbuild (@) {
 			}
 		}
 	}
+
+	return $needsbuild;
 }
 
 sub preprocess (@) {
@@ -56,11 +58,17 @@ 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;
 
-	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-	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"),
 		htmllink($params{page}, $params{destpage}, $link),
 	       	$params{match});
@@ -124,9 +132,6 @@ sub filltemplate ($$) {
 		# up a template that doesn't work.
 		return "[[!pagetemplate ".gettext("failed to process template:")." $@]]";
 	}
-	if (! defined $template) {
-		return;
-	}
 
 	$template->param(name => $page);