Moved read only check after permissions and block so that the user doesn't think...

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 1c092da..60ed5dd 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -828,10 +828,6 @@ abstract class FormSpecialPage extends SpecialPage {
         * @throws ErrorPageError
         */
        protected function checkExecutePermissions( User $user ) {
-               if ( $this->requiresWrite() ) {
-                       $this->checkReadOnly();
-               }
-
                $this->checkPermissions();
 
                if ( $this->requiresUnblock() && $user->isBlocked() ) {
@@ -839,6 +835,10 @@ abstract class FormSpecialPage extends SpecialPage {
                        throw new UserBlockedError( $block );
                }
 
+               if ( $this->requiresWrite() ) {
+                       $this->checkReadOnly();
+               }
+
                return true;
        }