diff options
| author | Joey Hess <joey@kitenet.net> | 2010-08-30 18:31:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-08-30 18:31:56 -0400 |
| commit | 2df0999e4033278a6cc8f6e2d00449224aa09efa (patch) | |
| tree | 8f72cf07bcaa62e6ab7f2f9d7037c58a95238133 | |
| parent | 70db57134a73cde5cafac0f02a3858a22d44ed26 (diff) | |
revert check_canedit nosubs thing
Abstraction violation. I now think the problem should be treated as a bug
in httpauth.
| -rw-r--r-- | IkiWiki.pm | 4 | ||||
| -rw-r--r-- | IkiWiki/Receive.pm | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index d114c9a69..6da281999 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1455,12 +1455,11 @@ sub filter ($$$) { return $content; } -sub check_canedit ($$$;$$) { +sub check_canedit ($$$;$) { my $page=shift; my $q=shift; my $session=shift; my $nonfatal=shift; - my $nosubs=shift; my $canedit; run_hooks(canedit => sub { @@ -1471,7 +1470,6 @@ sub check_canedit ($$$;$$) { $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; } diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 972e3578d..e77c477a9 100644 --- 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) { - 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}); - IkiWiki::check_canedit($file, $cgi, $session, 0, 1); + IkiWiki::check_canedit($file, $cgi, $session); 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); - IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1); + IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session); next; } } |