revert accidental code change

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index c1811643b7c77666b0b9e9ff95ceaea7de6ba100..127c321f0491978c9b88760685963f785cd1062e 100644 (file)
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,8 +9,6 @@ use IkiWiki 3.00;
 sub import {
        hook(type => "getsetup", id => "httpauth", call => \&getsetup);
        hook(type => "auth", id => "httpauth", call => \&auth);
 sub import {
        hook(type => "getsetup", id => "httpauth", call => \&getsetup);
        hook(type => "auth", id => "httpauth", call => \&auth);

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

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -35,20 +33,10 @@ sub auth ($$) {
        if (defined $cgi->remote_user()) {
                $session->param("name", $cgi->remote_user());
        }
        if (defined $cgi->remote_user()) {
                $session->param("name", $cgi->remote_user());
        }

-}
-
-sub canedit ($$$) {
-       my $page=shift;
-       my $cgi=shift;
-       my $session=shift;
-
-       if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+       elsif (defined $config{cgiauthurl}) {

                IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
                exit;
        }
                IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
                exit;
        }

-       else {
-               return undef;
-       }

 }
 
 1
 }
 
 1