X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/93cd30bc0a882037ae2c65c8d6d3a9dc3d09c899..2df0999e4033278a6cc8f6e2d00449224aa09efa:/IkiWiki/Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index cd94d0938..e77c477a9 100644
--- 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;
@@ -82,7 +81,7 @@ sub test () {
 		my ($file)=$change->{file}=~/$config{wiki_file_regexp}/;
 		$file=IkiWiki::possibly_foolish_untaint($file);
 		if (! defined $file || ! length $file ||
-		    IkiWiki::file_pruned($file, $config{srcdir})) {
+		    IkiWiki::file_pruned($file)) {
 			error(gettext("bad file name %s"), $file);
 		}
 
@@ -96,21 +95,20 @@ 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);
+				next;
 			}
 			else {
 				if (IkiWiki::Plugin::attachment->can("check_canattach")) {
 					IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
+					IkiWiki::check_canedit($file, $cgi, $session);
 					next;
 				}
 			}
 		}
 		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,6 +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);
 				next;
 			}
 		}