brace style and layout

[ikiwiki.git] / IkiWiki / Plugin / edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 0bafc95d06d854b860e566a8c14134119d51db17..a163b0d84c3b28cee03ab3eecd24744ee5a2fc65 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -55,10 +55,11 @@ 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});
@@ -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}) {