X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3922ba15ba04d5519e77eae3cdc760e5853687d4..a4d033691ab8d00f4217e49dad35474be4763d1e:/IkiWiki/Plugin/edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index aa72b0845..98308de13 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -8,6 +8,8 @@ use HTML::Template;
 use Encode;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "edittemplate",
+		call => \&getsetup);
 	hook(type => "needsbuild", id => "edittemplate",
 		call => \&needsbuild);
 	hook(type => "preprocess", id => "edittemplate",
@@ -16,12 +18,21 @@ sub import { #{{{
 		call => \&formbuilder);
 } #}}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
 sub needsbuild (@) { #{{{
 	my $needsbuild=shift;
 
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{edittemplate}) {
-			if (grep { $_ eq $pagesources{$page} } @$needsbuild) {
+			if (exists $pagesources{$page} && 
+			    grep { $_ eq $pagesources{$page} } @$needsbuild) {
 				# remove state, it will be re-added
 				# if the preprocessor directive is still
 				# there during the rebuild
@@ -37,10 +48,10 @@ sub preprocess (@) { #{{{
 	return "" if $params{page} ne $params{destpage};
 
 	if (! exists $params{template} || ! length($params{template})) {
-		return return "[[meta ".gettext("template not specified")."]]";
+		error gettext("template not specified")
 	}
 	if (! exists $params{match} || ! length($params{match})) {
-		return return "[[meta ".gettext("match not specified")."]]";
+		error gettext("match not specified")
 	}
 
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
@@ -53,7 +64,9 @@ sub formbuilder (@) { #{{{
 	my %params=@_;
 	my $form=$params{form};
 
-	return if $form->field("do") ne "create";
+	return if $form->field("do") ne "create" ||
+		length $form->field("editcontent");
+	
 	my $page=$form->field("page");
 	
 	# The tricky bit here is that $page is probably just the base
@@ -107,7 +120,9 @@ sub filltemplate ($$) { #{{{
 		);
 	};
 	if ($@) {
-		return "[[pagetemplate ".gettext("failed to process")." $@]]";
+		# Indicate that the earlier preprocessor directive set 
+		# up a template that doesn't work.
+		return "[[!pagetemplate ".gettext("failed to process")." $@]]";
 	}
 
 	$template->param(name => $page);