From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Aug 2010 19:58:42 +0000 (-0400)
Subject: factor out check_canedit calls from check_canremove
X-Git-Tag: 3.20100831~19
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=75382bd3747f4c293a5fee5715bfbebe0ff04187

factor out check_canedit calls from check_canremove
---

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 95f148183..4b527993b 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -42,9 +42,6 @@ sub check_canremove ($$$) {
 		error(sprintf(gettext("%s is not a file"), $file));
 	}
 	
-	# Must be editable.
-	IkiWiki::check_canedit($page, $q, $session);
-
 	# If a user can't upload an attachment, don't let them delete it.
 	# This is sorta overkill, but better safe than sorry.
 	if (! defined pagetype($pagesources{$page})) {
@@ -121,6 +118,7 @@ sub removal_confirm ($$@) {
 	my @pages=@_;
 
 	foreach my $page (@pages) {
+		IkiWiki::check_canedit($page, $q, $session);
 		check_canremove($page, $q, $session);
 	}
 
@@ -198,6 +196,7 @@ sub sessioncgi ($$) {
 			# and that the user is allowed to edit(/remove) it.
 			my @files;
 			foreach my $page (@pages) {
+				IkiWiki::check_canedit($page, $q, $session);
 				check_canremove($page, $q, $session);
 				
 				# This untaint is safe because of the