Merge branch 'master' into cvs

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

diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index ef7b9b428029f57687da3538a52b2ab75727c6ad..31160c02ffb581ad28da533e42737db8761295fe 100644 (file)
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -3,23 +3,24 @@ package IkiWiki::Plugin::signinedit;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "signinedit", call => \&getsetup);
        hook(type => "canedit", id => "signinedit", call => \&canedit,
             last => 1);
        hook(type => "getsetup", id => "signinedit", call => \&getsetup);
        hook(type => "canedit", id => "signinedit", call => \&canedit,
             last => 1);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
                        rebuild => 0,
        return
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "auth",

                },
                },

-} #}}}
+}

 
 

-sub canedit ($$$) { #{{{
+sub canedit ($$$) {

        my $page=shift;
        my $cgi=shift;
        my $session=shift;
        my $page=shift;
        my $cgi=shift;
        my $session=shift;


@@ -29,11 +30,12 @@ sub canedit ($$$) { #{{{
        # signin can override this.
         if (! defined $session->param("name") ||
             ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
        # signin can override this.
         if (! defined $session->param("name") ||
             ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {

+               return "" unless exists $IkiWiki::hooks{auth};

                return sub { IkiWiki::needsignin($cgi, $session) };
        }
        else {
                return "";
        }
                return sub { IkiWiki::needsignin($cgi, $session) };
        }
        else {
                return "";
        }

-} #}}}
+}

 
 1
 
 1