dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
f972338
)
Merge "Chunked upload result should consistently have a "stage" value for "Poll""
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Mon, 8 Sep 2014 15:16:53 +0000
(15:16 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Mon, 8 Sep 2014 15:16:53 +0000
(15:16 +0000)
includes/api/ApiUpload.php
patch
|
blob
|
history
diff --git
a/includes/api/ApiUpload.php
b/includes/api/ApiUpload.php
index
aa8fe21
..
657181b
100644
(file)
--- 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'],