dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Allow passing detailed permission errors data to API"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiUpload.php
diff --git
a/includes/api/ApiUpload.php
b/includes/api/ApiUpload.php
index
5f34701
..
f51b389
100644
(file)
--- a/
includes/api/ApiUpload.php
+++ b/
includes/api/ApiUpload.php
@@
-362,6
+362,10
@@
class ApiUpload extends ApiBase {
$data['invalidparameter'] = $parameter;
$parsed = $this->parseMsg( $error );
+ if ( isset( $parsed['data'] ) ) {
+ $data = array_merge( $data, $parsed['data'] );
+ }
+
$this->dieUsage( $parsed['info'], $parsed['code'], 0, $data );
}