From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Sat, 30 Aug 2014 15:26:31 +0000 (+0200)
Subject: mediawiki.api: Actually don't log request error 'abort'
X-Git-Tag: 1.31.0-rc.0~14150
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=f6326665cd31b0c83768d7edad4f901918c80dc4;p=lhc%2Fweb%2Fwiklou.git

mediawiki.api: Actually don't log request error 'abort'

173930cb32, once more, with feeling. I'm not sure why the previous
version has ever worked, given that our own code (a few lines above
this, starting from '// Make the AJAX request') is written in such a
way that `code` can never be `'abort'`.

Bug: 65442
Change-Id: I34bcaa362806bf9e80fb40bc92723f85bea1fb64
---

diff --git a/resources/src/mediawiki.api/mediawiki.api.js b/resources/src/mediawiki.api/mediawiki.api.js
index f8dc836320..51b3238cba 100644
--- a/resources/src/mediawiki.api/mediawiki.api.js
+++ b/resources/src/mediawiki.api/mediawiki.api.js
@@ -225,7 +225,7 @@
 
 			// Return the Promise
 			return apiDeferred.promise( { abort: xhr.abort } ).fail( function ( code, details ) {
-				if ( code !== 'abort' ) {
+				if ( !( code === 'http' && details && details.textStatus === 'abort' ) ) {
 					mw.log( 'mw.Api error: ', code, details );
 				}
 			} );