From: Matthias Mullie <git@mullie.eu>
Date: Thu, 8 Dec 2016 17:05:23 +0000 (+0100)
Subject: Let mw.Api recognize errorformat!=bc
X-Git-Tag: 1.31.0-rc.0~4637^2
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=2ee4ecb1188f81a9c381e92cec4e20badfb3223e;p=lhc%2Fweb%2Fwiklou.git

Let mw.Api recognize errorformat!=bc

Iae0e2ce3bd42dd4776a9779664086119ac188412 introduced a new
API error format where, in case of error, there is no
'error' property in the response, but an 'errors'.
mw.Api doesn't recognize those as errors and just resolves
the deferred, instead of rejecting it.

Change-Id: I4c05ef7d7574e2ca538170609fab85d8463b7b68
---

diff --git a/resources/src/mediawiki/api.js b/resources/src/mediawiki/api.js
index 0c08ca4b69..b9db0590ee 100644
--- a/resources/src/mediawiki/api.js
+++ b/resources/src/mediawiki/api.js
@@ -263,6 +263,9 @@
 					} else if ( result.error ) {
 						code = result.error.code === undefined ? 'unknown' : result.error.code;
 						apiDeferred.reject( code, result, result, jqXHR );
+					} else if ( result.errors ) {
+						code = result.errors[ 0 ].code === undefined ? 'unknown' : result.errors[ 0 ].code;
+						apiDeferred.reject( code, result, result, jqXHR );
 					} else {
 						apiDeferred.resolve( result, jqXHR );
 					}