X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c0d7c60b9f94b3f2927cd8484991e33190cd84cd..bd50ba3e8392db13c584b4166783ee4794b20365:/IkiWiki/Plugin/edittemplate.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 4d4117c15..846b4e7c8 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -54,16 +54,14 @@ sub preprocess (@) { #{{{
 		error gettext("match not specified")
 	}
 
-	$pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
+	my $link=linkpage($params{template});
+	$pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
 
 	return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-
-	my $link=IkiWiki::linkpage($params{template});
 	add_depends($params{page}, $link);
-	my $linkHTML = htmllink($params{page}, $params{destpage}, $link);
-
 	return sprintf(gettext("edittemplate %s registered for %s"),
-		$linkHTML, $params{match});
+		htmllink($params{page}, $params{destpage}, $link),
+	       	$params{match});
 } # }}}
 
 sub formbuilder (@) { #{{{
@@ -71,7 +69,7 @@ sub formbuilder (@) { #{{{
 	my $form=$params{form};
 
 	return if $form->field("do") ne "create" ||
-		length $form->field("editcontent");
+		(defined $form->field("editcontent") && length $form->field("editcontent"));
 	
 	my $page=$form->field("page");