From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Thu, 21 Apr 2016 15:32:05 +0000 (+0200)
Subject: mediawiki.api.upload: Unbreak finishing stash uploads
X-Git-Tag: 1.31.0-rc.0~7223^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_modifier.php?a=commitdiff_plain;h=a50c7a8cc4adc0885e3edd97b8953235d665ac4f;p=lhc%2Fweb%2Fwiklou.git

mediawiki.api.upload: Unbreak finishing stash uploads

The upload would complete successfully, but the upload
dialog would just hang for the user.

Follow-up to 11a2791668260211f1b82ec4954082533ff3adee.

Bug: T133295
Change-Id: I92724c6356d7dbf5c4cb87c05366bb7ed1ec8587
---

diff --git a/resources/src/mediawiki/api/upload.js b/resources/src/mediawiki/api/upload.js
index 3c8b3f6571..c2da10e2f9 100644
--- a/resources/src/mediawiki/api/upload.js
+++ b/resources/src/mediawiki/api/upload.js
@@ -347,7 +347,7 @@
 			}
 
 			function finishUpload( moreData ) {
-				api.uploadFromStash( filekey, $.extend( data, moreData ) );
+				return api.uploadFromStash( filekey, $.extend( data, moreData ) );
 			}
 
 			return this.upload( file, { stash: true, filename: data.filename } ).then(