comments: Fix missing entity encoding in title.

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 7d2eba194537857cb1088a90e2a4afa82009b507..5f0551d9272972d34d685df5ecc57e3802ca054f 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -23,6 +23,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "web",

                },
 }
 
                },
 }
 


@@ -55,7 +56,8 @@ sub preprocess (@) {
        }
 
        my $link=linkpage($params{template});
        }
 
        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"));
 
        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;
        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}) {
        foreach my $p (@page_locs) {
                foreach my $registering_page (keys %pagestate) {
                        if (exists $pagestate{$registering_page}{edittemplate}) {