From: umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 11 Feb 2014 18:37:07 +0000 (+0100)
Subject: Fix possible error list for action=query&list=blocks
X-Git-Tag: 1.31.0-rc.0~16843^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=2e1222109c1a5eb19c1d578335cec16f14c19b53;p=lhc%2Fweb%2Fwiklou.git

Fix possible error list for action=query&list=blocks

possible errors for requireMaxOneParameter are generated with getRequireMaxOneParameterErrorMessages,
not getRequireOnlyOneParameterErrorMessages

Change-Id: Ia3d705ddf2f2d969b3112962a13f27dc9a106037
---

diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php
index 57f76bc45f..47768cb70b 100644
--- a/includes/api/ApiQueryBlocks.php
+++ b/includes/api/ApiQueryBlocks.php
@@ -415,7 +415,7 @@ class ApiQueryBlocks extends ApiQueryBase {
 		global $wgBlockCIDRLimit;
 
 		return array_merge( parent::getPossibleErrors(),
-			$this->getRequireOnlyOneParameterErrorMessages( array( 'users', 'ip' ) ),
+			$this->getRequireMaxOneParameterErrorMessages( array( 'users', 'ip' ) ),
 			array(
 				array(
 					'code' => 'cidrtoobroad',