From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Aug 2010 20:17:33 +0000 (-0400)
Subject: add explicit check_canedit calls when checking canattach or canremove
X-Git-Tag: 3.20100831~17
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b84ea2f535e46f3d510f05a0b8970d6c94f5104;p=ikiwiki.git

add explicit check_canedit calls when checking canattach or canremove
---

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 14936f8cd..2952480b4 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -100,7 +100,7 @@ sub test () {
 			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);
 				}
 			}
 		}
@@ -116,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 {