From: Thalia <thalia.e.chan@googlemail.com>
Date: Wed, 3 Jul 2019 06:47:01 +0000 (+0100)
Subject: Fix API message maps for block errors
X-Git-Tag: 1.34.0-rc.0~1187^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=55ebd6ad589e6ea8edbba67e670e779bac1aa853;p=lhc%2Fweb%2Fwiklou.git

Fix API message maps for block errors

* Add composite block error message key to ApiBase
* Fix partial block error message key to point to partial block API
  error message key
* Add partial and composite block message keys to ApiMessageTrait

Bug: T227167
Bug: T227168
Change-Id: I5c354d2f038c5b02837268584eb43750a9ebb712
---

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index e798414a6f..63d8b18eb8 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -280,9 +280,10 @@ abstract class ApiBase extends ContextSource {
 	/** $var array Map of web UI block messages to corresponding API messages and codes */
 	private static $blockMsgMap = [
 		'blockedtext' => [ 'apierror-blocked', 'blocked' ],
-		'blockedtext-partial' => [ 'apierror-blocked', 'blocked' ],
+		'blockedtext-partial' => [ 'apierror-blocked-partial', 'blocked' ],
 		'autoblockedtext' => [ 'apierror-autoblocked', 'autoblocked' ],
 		'systemblockedtext' => [ 'apierror-systemblocked', 'blocked' ],
+		'blockedtext-composite' => [ 'apierror-blocked', 'blocked' ],
 	];
 
 	/** @var ApiMain */
diff --git a/includes/api/ApiMessageTrait.php b/includes/api/ApiMessageTrait.php
index 6894d2809f..73e4ac26d5 100644
--- a/includes/api/ApiMessageTrait.php
+++ b/includes/api/ApiMessageTrait.php
@@ -37,6 +37,8 @@ trait ApiMessageTrait {
 		'badipaddress' => 'invalidip',
 		'blankpage' => 'emptypage',
 		'blockedtext' => 'blocked',
+		'blockedtext-composite' => 'blocked',
+		'blockedtext-partial' => 'blocked',
 		'cannotdelete' => 'cantdelete',
 		'cannotundelete' => 'cantundelete',
 		'cantmove-titleprotected' => 'protectedtitle',