aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-08-30 16:05:15 -0400
committerJoey Hess <joey@kitenet.net>2010-08-30 16:05:15 -0400
commita330b1ee743f093a03ff23b2d4bff42df7def8b9 (patch)
treedb285b7184750aeb2cb7159320c2545e5cb233b4 /IkiWiki
parent75382bd3747f4c293a5fee5715bfbebe0ff04187 (diff)
downloadikiwiki-a330b1ee743f093a03ff23b2d4bff42df7def8b9.tar
ikiwiki-a330b1ee743f093a03ff23b2d4bff42df7def8b9.tar.gz
Avoid trying to log the user in when receiving anonymous pushes from git and a plugin like httpauth returns a login function.
Just use check_canedit in nonfatal mode.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Receive.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index d116049c4..14936f8cd 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -95,8 +95,7 @@ sub test () {
if ($change->{action} eq 'change' ||
$change->{action} eq 'add') {
if (defined $page) {
- IkiWiki::check_canedit($page, $cgi, $session);
- next;
+ next if IkiWiki::check_canedit($page, $cgi, $session, 1);
}
else {
if (IkiWiki::Plugin::attachment->can("check_canattach")) {