Merge branch 'prv/po' into pub/po

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 4d4117c150a8c958b70af9ec17dc98671474c11b..846b4e7c832c499a0755860b2c277b282a2b2f1d 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -54,16 +54,14 @@ sub preprocess (@) { #{{{
                error gettext("match not specified")
        }
 
                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}));
 
        return "" if ($params{silent} && IkiWiki::yesno($params{silent}));

-
-       my $link=IkiWiki::linkpage($params{template});

        add_depends($params{page}, $link);
        add_depends($params{page}, $link);

-       my $linkHTML = htmllink($params{page}, $params{destpage}, $link);
-

        return sprintf(gettext("edittemplate %s registered for %s"),
        return sprintf(gettext("edittemplate %s registered for %s"),

-               $linkHTML, $params{match});
+               htmllink($params{page}, $params{destpage}, $link),
+               $params{match});

 } # }}}
 
 sub formbuilder (@) { #{{{
 } # }}}
 
 sub formbuilder (@) { #{{{


@@ -71,7 +69,7 @@ sub formbuilder (@) { #{{{
        my $form=$params{form};
 
        return if $form->field("do") ne "create" ||
        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");
        
        
        my $page=$form->field("page");