Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index 9872e9686c2a3255d638968002a5d6339c1d20e2..f5d7837fc4c4712de2b693497ce3dd1b7a977b59 100644 (file)
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -9,10 +9,19 @@ use HTML::Entities;
 use IPC::Open2;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "editdiff", call => \&getsetup);
        hook(type => "formbuilder_setup", id => "editdiff",
                call => \&formbuilder_setup);
 } #}}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
+} #}}}
+
 sub diff ($$) { #{{{
        my $orig=shift;
        my $content=shift;
@@ -47,7 +56,7 @@ sub formbuilder_setup { #{{{
        my %params=@_;
        my $form=$params{form};
 
-       return if defined ! $form->field("do") || $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);