wfReadOnly now checked in ApiMain::requestWriteMode

diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php
index 2a13c29..3482148 100644 (file)
--- a/includes/api/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@ -72,8 +72,6 @@ class ApiBlock extends ApiBase {
                        $this->dieUsageMsg(array('canthide'));
                if($params['noemail'] && !$wgUser->isAllowed('blockemail'))
                        $this->dieUsageMsg(array('cantblock-email'));
-               if(wfReadOnly())
-                       $this->dieUsageMsg(array('readonlytext'));
 
                $form = new IPBlockForm('');
                $form->BlockAddress = $params['user'];

diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 5f1dd47..76d66fe 100644 (file)
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -90,8 +90,6 @@ class ApiDelete extends ApiBase {
 
        private static function getPermissionsError(&$title, $token) {
                global $wgUser;
-               // Check wiki readonly
-               if (wfReadOnly()) return array(array('readonlytext'));
                
                // Check permissions
                $errors = $title->getUserPermissionsErrors('delete', $wgUser);

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index c3946e5..4751296 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -211,6 +211,8 @@ class ApiMain extends ApiBase {
                if (!$wgUser->isAllowed('writeapi'))
                        $this->dieUsage('You\'re not allowed to edit this ' .
                        'wiki through the API', 'writeapidenied');
+               if (wfReadOnly())
+                       $this->dieUsageMsg(array('readonlytext'));
        }
 
        /**

diff --git a/includes/api/ApiUnblock.php b/includes/api/ApiUnblock.php
index cf98f0f..acfeb9a 100644 (file)
--- a/includes/api/ApiUnblock.php
+++ b/includes/api/ApiUnblock.php
@@ -64,8 +64,6 @@ class ApiUnblock extends ApiBase {
                        $this->dieUsageMsg(array('sessionfailure'));
                if(!$wgUser->isAllowed('block'))
                        $this->dieUsageMsg(array('cantunblock'));
-               if(wfReadOnly())
-                       $this->dieUsageMsg(array('readonlytext'));
 
                $id = $params['id'];
                $user = $params['user'];

diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index 412e283..f54511b 100644 (file)
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -51,8 +51,6 @@ class ApiUndelete extends ApiBase {
                        $this->dieUsageMsg(array('permdenied-undelete'));
                if($wgUser->isBlocked())
                        $this->dieUsageMsg(array('blockedtext'));
-               if(wfReadOnly())
-                       $this->dieUsageMsg(array('readonlytext'));
                if(!$wgUser->matchEditToken($params['token']))
                        $this->dieUsageMsg(array('sessionfailure'));