From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 1 Jul 2008 17:22:11 +0000 (-0400)
Subject: reorder
X-Git-Tag: 2.52~14^2~24
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/de6ed410bc8edfd558a62eac4536a716027da114?ds=sidebyside;hp=--cc

reorder

canedit should fail first as it's a less expensive and harder to pass test
---

de6ed410bc8edfd558a62eac4536a716027da114
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 8babe2be2..23862bc05 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -54,6 +54,10 @@ sub formbuilder (@) { #{{{
 		# The editpage code has already checked that
 		# $form->field('page') is valid.
 		$filename="XXX/$filename";
+
+		# Also check that the user is allowed to edit it by other
+		# policies.
+		IkiWiki::check_canedit($filename, $q, $params{session}, 1);
 		
 		# Use a pagespec to test that the attachment is valid.
 		if (exists $config{valid_attachments} &&
@@ -65,10 +69,6 @@ sub formbuilder (@) { #{{{
 			}
 		}
 
-		# Also check that the user is allowed to edit it by other
-		# policies.
-		IkiWiki::check_canedit($filename, $q, $params{session}, 1);
-
 		# Move the attachment into place.
 		# Try to use a fast rename; fall back to copying.
 		prep_writefile($filename, $config{srcdir});