Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index c381940e5edd4056b5622c0daeb10cab1d6423a8..846b4e7c832c499a0755860b2c277b282a2b2f1d 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -54,16 +54,14 @@ sub preprocess (@) { #{{{
                error gettext("match not specified")
        }
 
-       $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
+       my $link=linkpage($params{template});
+       $pagestate{$params{page}}{edittemplate}{$params{match}}=$link;
 
        return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-
-       my $link=IkiWiki::linkpage($params{template});
        add_depends($params{page}, $link);
-       my $linkHTML = htmllink($params{page}, $params{destpage}, $link);
-
-       return sprintf(gettext("edittemplate: %s registered for %s"),
-               $linkHTML, $params{match});
+       return sprintf(gettext("edittemplate %s registered for %s"),
+               htmllink($params{page}, $params{destpage}, $link),
+               $params{match});
 } # }}}
 
 sub formbuilder (@) { #{{{
@@ -71,7 +69,7 @@ sub formbuilder (@) { #{{{
        my $form=$params{form};
 
        return if $form->field("do") ne "create" ||
-               length $form->field("editcontent");
+               (defined $form->field("editcontent") && length $form->field("editcontent"));
        
        my $page=$form->field("page");
        
@@ -93,11 +91,12 @@ sub formbuilder (@) { #{{{
                        if (exists $pagestate{$registering_page}{edittemplate}) {
                                foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
                                        if (pagespec_match($p, $pagespec, location => $registering_page)) {
+                                               my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
                                                $form->field(name => "editcontent",
-                                                        value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
+                                                        value =>  filltemplate($template, $page));
                                                $form->field(name => "type",
-                                                        value => pagetype($pagesources{$pagestate{$registering_page}{edittemplate}{$pagespec}}))
-                                                               if $pagesources{$pagestate{$registering_page}{edittemplate}{$pagespec}};
+                                                        value => pagetype($pagesources{$template}))
+                                                               if $pagesources{$template};
                                                return;
                                        }
                                }