Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index d45c73e8f89b6af16c03d5357113df0a4338fec0..9872e9686c2a3255d638968002a5d6339c1d20e2 100644 (file)
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -46,10 +46,10 @@ sub diff ($$) { #{{{
 sub formbuilder_setup { #{{{
        my %params=@_;
        my $form=$params{form};
 sub formbuilder_setup { #{{{
        my %params=@_;
        my $form=$params{form};

-       my $page=$form->field("page");

 
 

-       return if $form->field("do") ne "edit";
+       return if defined ! $form->field("do") || $form->field("do") ne "edit";

 
 

+       my $page=$form->field("page");

        $page = IkiWiki::possibly_foolish_untaint($page);
        return unless exists $pagesources{$page};
 
        $page = IkiWiki::possibly_foolish_untaint($page);
        return unless exists $pagesources{$page};