From f77fff0ffbb0a5d7d7158453e26c7f30164d99a3 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Wed, 4 Aug 2010 19:20:15 +0000 Subject: [PATCH] Followup r70461 if PARAM_REQUIRED is set, use for missing param in getPossibleErrors in ApiBase All but ApiQueryBacklinks --- includes/api/ApiBase.php | 9 +++++++++ includes/api/ApiBlock.php | 1 - includes/api/ApiEditPage.php | 1 - includes/api/ApiEmailUser.php | 2 -- includes/api/ApiMove.php | 1 - includes/api/ApiPatrol.php | 1 - includes/api/ApiProtect.php | 2 -- includes/api/ApiPurge.php | 1 - includes/api/ApiRollback.php | 2 -- includes/api/ApiUndelete.php | 1 - includes/api/ApiUpload.php | 1 - 11 files changed, 9 insertions(+), 13 deletions(-) diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index a1bb693562..15a3a897fa 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -1126,6 +1126,15 @@ abstract class ApiBase { public function getPossibleErrors() { $ret = array(); + $params = $this->getFinalParams(); + if ( $params ) { + foreach ( $params as $paramName => $paramSettings ) { + if( isset( $paramSettings[ApiBase::PARAM_REQUIRED] ) ) { + $ret[] = array( 'missingparam', $paramName ); + } + } + } + if ( $this->mustBePosted() ) { $ret[] = array( 'mustbeposted', $this->getModuleName() ); } diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php index ac2daa4d41..2cd9bbd41b 100644 --- a/includes/api/ApiBlock.php +++ b/includes/api/ApiBlock.php @@ -173,7 +173,6 @@ class ApiBlock extends ApiBase { public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( - array( 'missingparam', 'user' ), array( 'cantblock' ), array( 'canthide' ), array( 'cantblock-email' ), diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index 5b3afbe001..819558d693 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -350,7 +350,6 @@ class ApiEditPage extends ApiBase { global $wgMaxArticleSize; return array_merge( parent::getPossibleErrors(), array( - array( 'missingparam', 'title' ), array( 'missingtext' ), array( 'invalidtitle', 'title' ), array( 'createonly-exists' ), diff --git a/includes/api/ApiEmailUser.php b/includes/api/ApiEmailUser.php index 088f696966..18159ec937 100644 --- a/includes/api/ApiEmailUser.php +++ b/includes/api/ApiEmailUser.php @@ -114,8 +114,6 @@ class ApiEmailUser extends ApiBase { public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( array( 'usermaildisabled' ), - array( 'missingparam', 'target' ), - array( 'missingparam', 'text' ), ) ); } diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php index e3e7ab7a8c..3e9c4cf7e7 100644 --- a/includes/api/ApiMove.php +++ b/includes/api/ApiMove.php @@ -223,7 +223,6 @@ class ApiMove extends ApiBase { public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( - array( 'missingparam', 'to' ), array( 'invalidtitle', 'from' ), array( 'nosuchpageid', 'fromid' ), array( 'notanarticle' ), diff --git a/includes/api/ApiPatrol.php b/includes/api/ApiPatrol.php index 461c2cdeeb..e180b357c6 100644 --- a/includes/api/ApiPatrol.php +++ b/includes/api/ApiPatrol.php @@ -85,7 +85,6 @@ class ApiPatrol extends ApiBase { public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( - array( 'missingparam', 'rcid' ), array( 'nosuchrcid', 'rcid' ), ) ); } diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php index 0b7e30759e..d9e55b6b29 100644 --- a/includes/api/ApiProtect.php +++ b/includes/api/ApiProtect.php @@ -196,8 +196,6 @@ class ApiProtect extends ApiBase { public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( - array( 'missingparam', 'title' ), - array( 'missingparam', 'protections' ), array( 'invalidtitle', 'title' ), array( 'toofewexpiries', 'noofexpiries', 'noofprotections' ), array( 'create-titleexists' ), diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php index dc2bac092f..afe7df7578 100644 --- a/includes/api/ApiPurge.php +++ b/includes/api/ApiPurge.php @@ -102,7 +102,6 @@ class ApiPurge extends ApiBase { public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( array( 'cantpurge' ), - array( 'missingparam', 'titles' ), ) ); } diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php index 71e62eec0c..bc108fff9b 100644 --- a/includes/api/ApiRollback.php +++ b/includes/api/ApiRollback.php @@ -120,8 +120,6 @@ class ApiRollback extends ApiBase { public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( - array( 'missingparam', 'title' ), - array( 'missingparam', 'user' ), array( 'invalidtitle', 'title' ), array( 'notanarticle' ), array( 'invaliduser', 'user' ), diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php index 2551d050ed..a317adf9e1 100644 --- a/includes/api/ApiUndelete.php +++ b/includes/api/ApiUndelete.php @@ -138,7 +138,6 @@ class ApiUndelete extends ApiBase { public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( - array( 'missingparam', 'title' ), array( 'permdenied-undelete' ), array( 'blockedtext' ), array( 'invalidtitle', 'title' ), diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php index a6ba695e38..59a267d22e 100644 --- a/includes/api/ApiUpload.php +++ b/includes/api/ApiUpload.php @@ -397,7 +397,6 @@ class ApiUpload extends ApiBase { array( 'invalid-session-key' ), array( 'uploaddisabled' ), array( 'badaccess-groups' ), - array( 'missingparam', 'filename' ), array( 'mustbeloggedin', 'upload' ), array( 'badaccess-groups' ), array( 'badaccess-groups' ), -- 2.20.1