Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index d5729f70258a56c08f01b33eae4ec62969779409..ef7b9b428029f57687da3538a52b2ab75727c6ad 100644 (file)
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -6,10 +6,19 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "signinedit", call => \&getsetup);
        hook(type => "canedit", id => "signinedit", call => \&canedit,
             last => 1);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
+} #}}}
+
 sub canedit ($$$) { #{{{
        my $page=shift;
        my $cgi=shift;
@@ -19,7 +28,7 @@ sub canedit ($$$) { #{{{
        # hook runs last, so that any hooks that don't need the user to
        # signin can override this.
         if (! defined $session->param("name") ||
-            ! userinfo_get($session->param("name"), "regdate")) {
+            ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
                return sub { IkiWiki::needsignin($cgi, $session) };
        }
        else {