From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 24 Oct 2008 17:29:30 +0000 (-0400)
Subject: really fix calls to check_can*
X-Git-Tag: 2.68~98
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fbcb8553df1f6150f2cfb2fd5d81a65e93074ac5?ds=sidebyside;hp=--cc

really fix calls to check_can*
---

fbcb8553df1f6150f2cfb2fd5d81a65e93074ac5
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 33f548a14..c69911a7c 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -58,15 +58,15 @@ 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;
+				if (IkiWiki->can("check_canedit")) {
+				    IkiWiki::check_canedit($page, $cgi, $session);
+				    next;
 				}
 			}
 			else {
-				if (IkiWiki::Plugin::attachment->can("check_canattach") &&
-				    IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path})) {
-				    	next;
+				if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+					IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});
+					next;
 				}
 			}
 		}
@@ -80,15 +80,15 @@ sub test () { #{{{
 			# could add.)
 			next if $newfiles{$file};
 
-			if (IkiWiki::Plugin::remove->can("check_canremove") &&
-			    IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session)) {
+			if (IkiWiki::Plugin::remove->can("check_canremove")) {
+				IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session);
 				next;
 			}
 		}
 		else {
 			error "unknown action ".$change->{action};
 		}
-				
+		
 		error sprintf(gettext("you are not allowed to change %s"), $file);
 	}