X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e22b18aabcb46e3c0eafeb466b51bb3eb18cf1e1..1d97160dae775c31e166d9886472dacdd773d571:/IkiWiki/Plugin/edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 576c94be4..e3ce5e3d9 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -107,9 +107,11 @@ sub formbuilder (@) {
 						my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
 						$form->field(name => "editcontent",
 							 value =>  filltemplate($template, $page));
-						$form->field(name => "type",
-							 value => pagetype($pagesources{$template}))
+						my $type=pagetype($pagesources{$template})
 								if $pagesources{$template};
+						$form->field(name => "type",
+							 value => $type)
+								if defined $type;
 						return;
 					}
 				}
@@ -128,9 +130,11 @@ sub filltemplate ($$) {
 		$template=template("/".$template_page);
 	};
 	if ($@) {
+		# gettext can clobber $@
+		my $error = $@;
 		# Indicate that the earlier preprocessor directive set 
 		# up a template that doesn't work.
-		return "[[!pagetemplate ".gettext("failed to process template:")." $@]]";
+		return "[[!edittemplate ".gettext("failed to process template:")." $error]]";
 	}
 
 	$template->param(name => $page);