X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2ff3c8aee78114974b6930c18247f050d35f2012..2d1dfab20a6ed69f48c1696e00a97b44eac84062:/IkiWiki/Plugin/edittemplate.pm?ds=inline

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 846b4e7c8..a163b0d84 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -3,11 +3,11 @@ package IkiWiki::Plugin::edittemplate;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Template;
 use Encode;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "edittemplate",
 		call => \&getsetup);
 	hook(type => "needsbuild", id => "edittemplate",
@@ -16,17 +16,17 @@ sub import { #{{{
 		call => \&preprocess);
 	hook(type => "formbuilder", id => "edittemplate",
 		call => \&formbuilder);
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
 	my $needsbuild=shift;
 
 	foreach my $page (keys %pagestate) {
@@ -40,9 +40,9 @@ sub needsbuild (@) { #{{{
 			}
 		}
 	}
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
         my %params=@_;
 
 	return "" if $params{page} ne $params{destpage};
@@ -55,16 +55,17 @@ 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);
+	add_depends($params{page}, $link, deptype("presence"));
 	return sprintf(gettext("edittemplate %s registered for %s"),
 		htmllink($params{page}, $params{destpage}, $link),
 	       	$params{match});
-} # }}}
+}
 
-sub formbuilder (@) { #{{{
+sub formbuilder (@) {
 	my %params=@_;
 	my $form=$params{form};
 
@@ -82,10 +83,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}) {
@@ -103,9 +107,9 @@ sub formbuilder (@) { #{{{
 			}
 		}
 	}
-} #}}}
+}
 
-sub filltemplate ($$) { #{{{
+sub filltemplate ($$) {
 	my $template_page=shift;
 	my $page=shift;
 
@@ -136,6 +140,6 @@ sub filltemplate ($$) { #{{{
 	$template->param(name => $page);
 
 	return $template->output;
-} #}}}
+}
 
 1