From: Gilles Dubuc <gdubuc@wikimedia.org>
Date: Fri, 5 Sep 2014 07:31:00 +0000 (+0200)
Subject: Chunked upload result should consistently have a "stage" value for "Poll"
X-Git-Tag: 1.31.0-rc.0~14117^2
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=650b76518b8678e96ba37eab48d029b47b29b529;p=lhc%2Fweb%2Fwiklou.git

Chunked upload result should consistently have a "stage" value for "Poll"

Change-Id: If9c2b215c43eef002482695701182c471f8bb450
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/855
---

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index aa8fe21db0..657181b77a 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -241,6 +241,7 @@ class ApiUpload extends ApiBase {
 					)
 				) );
 				$result['result'] = 'Poll';
+				$result['stage'] = 'queued';
 			} else {
 				$status = $this->mUpload->concatenateChunks();
 				if ( !$status->isGood() ) {
@@ -631,6 +632,7 @@ class ApiUpload extends ApiBase {
 				)
 			) );
 			$result['result'] = 'Poll';
+			$result['stage'] = 'queued';
 		} else {
 			/** @var $status Status */
 			$status = $this->mUpload->performUpload( $this->mParams['comment'],