revert check_canedit nosubs thing

Abstraction violation. I now think the problem should be treated as a bug
in httpauth.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d114c9a69d760194e05c788e36a74d4c8ab3c144..6da281999f0b4c035805626f11d6e244c105d69f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1455,12 +1455,11 @@ sub filter ($$$) {
        return $content;
 }
 
        return $content;
 }
 

-sub check_canedit ($$$;$$) {
+sub check_canedit ($$$;$) {

        my $page=shift;
        my $q=shift;
        my $session=shift;
        my $nonfatal=shift;
        my $page=shift;
        my $q=shift;
        my $session=shift;
        my $nonfatal=shift;

-       my $nosubs=shift;

        
        my $canedit;
        run_hooks(canedit => sub {
        
        my $canedit;
        run_hooks(canedit => sub {


@@ -1471,7 +1470,6 @@ sub check_canedit ($$$;$$) {
                                $canedit=1;
                        }
                        elsif (ref $ret eq 'CODE') {
                                $canedit=1;
                        }
                        elsif (ref $ret eq 'CODE') {

-                               error(sprintf(gettext("you are not allowed to change %s"), $page)) if $nosubs && ! $nonfatal;

                                $ret->() unless $nonfatal;
                                $canedit=0;
                        }
                                $ret->() unless $nonfatal;
                                $canedit=0;
                        }

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 972e3578de0103650ba5455b609a175b06ea95cf..e77c477a98ad743b6db8d584067cff1cba992be3 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -95,13 +95,13 @@ sub test () {
                if ($change->{action} eq 'change' ||
                    $change->{action} eq 'add') {
                        if (defined $page) {
                if ($change->{action} eq 'change' ||
                    $change->{action} eq 'add') {
                        if (defined $page) {

-                               IkiWiki::check_canedit($page, $cgi, $session, 0, 1);
+                               IkiWiki::check_canedit($page, $cgi, $session);

                                next;
                        }
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
                                next;
                        }
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});

-                                       IkiWiki::check_canedit($file, $cgi, $session, 0, 1);
+                                       IkiWiki::check_canedit($file, $cgi, $session);

                                        next;
                                }
                        }
                                        next;
                                }
                        }


@@ -118,7 +118,7 @@ sub test () {
 
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {
                                IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
 
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {
                                IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);

-                               IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1);
+                               IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session);

                                next;
                        }
                }
                                next;
                        }
                }