avoid duplicate template lookup

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 98308de135ba42c6efc5d574b261d51cc5f18e29..4d4117c150a8c958b70af9ec17dc98671474c11b 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -56,8 +56,14 @@ sub preprocess (@) { #{{{
 
        $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
 
+       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"),
-               $params{template}, $params{match});
+               $linkHTML, $params{match});
 } # }}}
 
 sub formbuilder (@) { #{{{
@@ -87,8 +93,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{$template}))
+                                                               if $pagesources{$template};
                                                return;
                                        }
                                }