add explicit check_canedit calls when checking canattach or canremove

[git.ikiwiki.info.git] / IkiWiki / Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index ae1bd8bef44c8b6918f2d2ced55c2074d8bbca13..2952480b485428649425f2a02dab7d1bc1b224a6 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,15 +95,12 @@ 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;
-                               }
+                               next if IkiWiki::check_canedit($page, $cgi, $session, 1);
                        }
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
-                                       next;
+                                       next if IkiWiki::check_canedit($file, $cgi, $session, 1);
                                }
                        }
                }
@@ -120,7 +116,7 @@ sub test () {
 
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {
                                IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
-                               next;
+                               next if IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 1);
                        }
                }
                else {