X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiUpload.php;h=e76b3651ebf0988c7d857e3d6bf535132dd6b700;hb=32ff1f4c47dfcafd8b160c3a600b614e828f4618;hp=5f347017d5dd4cb47a301bbeac11aa2ac5fbe139;hpb=70fcdfe0f436f19de4cb6e0ccb5990d44f43c100;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 5f347017d5..e76b3651eb 100644
--- 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 );
 	}
 
@@ -623,7 +627,6 @@ class ApiUpload extends ApiBase {
 	protected function transformWarnings( $warnings ) {
 		if ( $warnings ) {
 			// Add indices
-			$result = $this->getResult();
 			ApiResult::setIndexedTagName( $warnings, 'warning' );
 
 			if ( isset( $warnings['duplicate'] ) ) {