Receive: avoid hiding check_canedit error messages

[ikiwiki.git] / IkiWiki / Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index ae1bd8bef44c8b6918f2d2ced55c2074d8bbca13..3a5f91758363bd6cd4521af3a7a6e966c2c91488 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -57,7 +57,6 @@ sub test () {
        eval q{use CGI};
        error($@) if $@;
        my $cgi=CGI->new;
-       $ENV{REMOTE_ADDR}='unknown' unless exists $ENV{REMOTE_ADDR};
 
        # And dummy up a session object.
        require IkiWiki::CGI;
@@ -96,21 +95,18 @@ sub test () {
                if ($change->{action} eq 'change' ||
                    $change->{action} eq 'add') {
                        if (defined $page) {
-                               if (IkiWiki->can("check_canedit")) {
-                                       IkiWiki::check_canedit($page, $cgi, $session);
-                                       next;
-                               }
+                               IkiWiki::check_canedit($page, $cgi, $session, 0, 1);
                        }
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
-                                       next;
+                                       IkiWiki::check_canedit($file, $cgi, $session, 0, 1);
                                }
                        }
                }
                elsif ($change->{action} eq 'remove') {
                        # check_canremove tests to see if the file is present
-                       # on disk. This will fail is a single commit adds a
+                       # on disk. This will fail when a single commit adds a
                        # file and then removes it again. Avoid the problem
                        # by not testing the removal in such pairs of changes.
                        # (The add is still tested, just to make sure that
@@ -120,14 +116,12 @@ sub test () {
 
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {
                                IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
-                               next;
+                               IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1);
                        }
                }
                else {
                        error "unknown action ".$change->{action};
                }
-               
-               error sprintf(gettext("you are not allowed to change %s"), $file);
        }
 
        exit 0;