X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a7cb3090902e23e2b0f2371539ade7ec5a4ba01b..54f600af14bf6dc067ffc30ec6f22d517001fe99:/IkiWiki/Plugin/edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 7d2eba194..5f0551d92 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -23,6 +23,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "web",
 		},
 }
 
@@ -55,7 +56,8 @@ sub preprocess (@) {
 	}
 
 	my $link=linkpage($params{template});
-	$pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
+	my $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"));
@@ -82,10 +84,13 @@ sub formbuilder (@) {
 	foreach my $field ($form->field) {
 		if ($field eq 'page') {
 			@page_locs=$field->def_value;
-			push @page_locs, $field->options;
+
+			# FormBuilder is on the bad crack. See #551499
+			my @options=map { ref $_ ? @$_ : $_ } $field->options;
+
+			push @page_locs, @options;
 		}
 	}
-
 	foreach my $p (@page_locs) {
 		foreach my $registering_page (keys %pagestate) {
 			if (exists $pagestate{$registering_page}{edittemplate}) {