dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3a6181e
)
ApiUpload: Fix fatal in dieStatusWithCode()
author
Bartosz Dziewoński
<matma.rex@gmail.com>
Mon, 22 Aug 2016 19:16:21 +0000
(21:16 +0200)
committer
Bartosz Dziewoński
<matma.rex@gmail.com>
Mon, 22 Aug 2016 19:16:21 +0000
(21:16 +0200)
If $extraData was null, but $moreExtraData was given, the following
fatal would occur:
Fatal error: Unsupported operand types in
/var/www/html/w/includes/api/ApiUpload.php on line 408
Follow-up to
c9b5b3e988e3554c231860a2da587dff16b05e0c
.
Change-Id: I613eed1f7429247fe46afa454d36f518f6a81ebe
includes/api/ApiUpload.php
patch
|
blob
|
history
diff --git
a/includes/api/ApiUpload.php
b/includes/api/ApiUpload.php
index
ac817ba
..
f7ce552
100644
(file)
--- a/
includes/api/ApiUpload.php
+++ b/
includes/api/ApiUpload.php
@@
-405,6
+405,7
@@
class ApiUpload extends ApiBase {
$code = $overrideCode;
}
if ( $moreExtraData ) {
+ $extraData = $extraData ?: [];
$extraData += $moreExtraData;
}
$this->dieUsage( $msg, $code, 0, $extraData );