Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 336eb793a2a1cc7e3da89e0dfd9728abc80601e3..fc0cffb1e3fa3d529baccc812b0ee77818bd6a39 100644 (file)
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -4,12 +4,21 @@ package IkiWiki::Plugin::httpauth;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

-       hook(type => "auth", id => "skeleton", call => \&auth);
+       hook(type => "getsetup", id => "httpauth", call => \&getsetup);
+       hook(type => "auth", id => "httpauth", call => \&auth);

 } # }}}
 
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
+} #}}}
+

 sub auth ($$) { #{{{
        my $cgi=shift;
        my $session=shift;
 sub auth ($$) { #{{{
        my $cgi=shift;
        my $session=shift;