X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/4745391360cf0843e376676479fee306d0a8312d..a3e16cd29f65182c4119bcc9303432efe01bc5c1:/IkiWiki/Plugin/edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 6689b9a5c..d1716a315 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -21,7 +21,8 @@ sub needsbuild (@) { #{{{
 
 	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 +38,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};
@@ -52,29 +53,20 @@ sub preprocess (@) { #{{{
 sub formbuilder (@) { #{{{
 	my %params=@_;
 	my $form=$params{form};
-	
-	return if $form->title ne "editpage"
-	          || $form->field("do") ne "create";
-	
+
+	return if $form->field("do") ne "create";
 	my $page=$form->field("page");
-	my $from=$form->field("from");
 	
 	# The tricky bit here is that $page is probably just the base
 	# page name, without any subdir, but the pagespec for a template
 	# probably does include the subdir (ie, "bugs/*"). We don't know
-	# what subdir the user will pick to put the page in. So, generate
-	# an ordered list and the first template to match will be used.
-	#
-	# This code corresponds to the code in editpage() that generates
-	# the list of possible page names, unfortunatly, that code runs
-	# later, so that list can't be simply reused.
+	# what subdir the user will pick to put the page in. So, try them
+	# all, starting with the one that was made default.
 	my @page_locs=$page;
-	if (defined $from) {
-		push @page_locs, "$from/$page";
-		my $dir=$from.="/";
-		while (length $dir) {
-			$dir=~s![^/]+/+$!!;
-			push @page_locs, $dir.$page;
+	foreach my $field ($form->field) {
+		if ($field eq 'page') {
+			@page_locs=$field->def_value;
+			push @page_locs, $field->options;
 		}
 	}
 
@@ -116,7 +108,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);