X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Fapi%2FApiUpload.php;h=7b44f409932c476f626334e3d4472da448253c77;hb=12e2154a6bbe3ae65c40ce2230dba9027b6fbb76;hp=fc2fd590560db6fe79aa9bcda30738290afe86a9;hpb=9928270c326da653c7d3c5655858f31c9ef2dd01;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index fc2fd59056..7b44f40993 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -109,16 +109,19 @@ class ApiUpload extends ApiBase {
 		// Get the result based on the current upload context:
 		try {
 			$result = $this->getContextResult();
-			if ( $result['result'] === 'Success' ) {
-				$result['imageinfo'] = $this->mUpload->getImageInfo( $this->getResult() );
-			}
 		} catch ( UploadStashException $e ) { // XXX: don't spam exception log
 			list( $msg, $code ) = $this->handleStashException( get_class( $e ), $e->getMessage() );
 			$this->dieUsage( $msg, $code );
 		}
-
 		$this->getResult()->addValue( null, $this->getModuleName(), $result );
 
+		// Add 'imageinfo' in a separate addValue() call. File metadata can be unreasonably large,
+		// so otherwise when it exceeded $wgAPIMaxResultSize, no result would be returned (T143993).
+		if ( $result['result'] === 'Success' ) {
+			$imageinfo = $this->mUpload->getImageInfo( $this->getResult() );
+			$this->getResult()->addValue( $this->getModuleName(), 'imageinfo', $imageinfo );
+		}
+
 		// Cleanup any temporary mess
 		$this->mUpload->cleanupTempFile();
 	}
@@ -274,11 +277,17 @@ class ApiUpload extends ApiBase {
 					$this->dieStatusWithCode( $status, 'stashfailed' );
 				}
 
+				// We can only get warnings like 'duplicate' after concatenating the chunks
+				$warnings = $this->getApiWarnings();
+				if ( $warnings ) {
+					$result['warnings'] = $warnings;
+				}
+
 				// The fully concatenated file has a new filekey. So remove
 				// the old filekey and fetch the new one.
 				UploadBase::setSessionStatus( $this->getUser(), $filekey, false );
 				$this->mUpload->stash->removeFile( $filekey );
-				$filekey = $this->mUpload->getLocalFile()->getFileKey();
+				$filekey = $this->mUpload->getStashFile()->getFileKey();
 
 				$result['result'] = 'Success';
 			}
@@ -399,6 +408,7 @@ class ApiUpload extends ApiBase {
 			$code = $overrideCode;
 		}
 		if ( $moreExtraData ) {
+			$extraData = $extraData ?: [];
 			$extraData += $moreExtraData;
 		}
 		$this->dieUsage( $msg, $code, 0, $extraData );
@@ -431,8 +441,25 @@ class ApiUpload extends ApiBase {
 			if ( isset( $progress['status']->value['verification'] ) ) {
 				$this->checkVerification( $progress['status']->value['verification'] );
 			}
+			if ( isset( $progress['status']->value['warnings'] ) ) {
+				$warnings = $this->transformWarnings( $progress['status']->value['warnings'] );
+				if ( $warnings ) {
+					$progress['warnings'] = $warnings;
+				}
+			}
 			unset( $progress['status'] ); // remove Status object
+			$imageinfo = null;
+			if ( isset( $progress['imageinfo'] ) ) {
+				$imageinfo = $progress['imageinfo'];
+				unset( $progress['imageinfo'] );
+			}
+
 			$this->getResult()->addValue( null, $this->getModuleName(), $progress );
+			// Add 'imageinfo' in a separate addValue() call. File metadata can be unreasonably large,
+			// so otherwise when it exceeded $wgAPIMaxResultSize, no result would be returned (T143993).
+			if ( $imageinfo ) {
+				$this->getResult()->addValue( $this->getModuleName(), 'imageinfo', $imageinfo );
+			}
 
 			return false;
 		}
@@ -677,6 +704,30 @@ class ApiUpload extends ApiBase {
 					: $warning['file'];
 				$warnings[$warning['warning']] = $localFile->getName();
 			}
+
+			if ( isset( $warnings['no-change'] ) ) {
+				/** @var File $file */
+				$file = $warnings['no-change'];
+				unset( $warnings['no-change'] );
+
+				$warnings['nochange'] = [
+					'timestamp' => wfTimestamp( TS_ISO_8601, $file->getTimestamp() )
+				];
+			}
+
+			if ( isset( $warnings['duplicate-version'] ) ) {
+				$dupes = [];
+				/** @var File $dupe */
+				foreach ( $warnings['duplicate-version'] as $dupe ) {
+					$dupes[] = [
+						'timestamp' => wfTimestamp( TS_ISO_8601, $dupe->getTimestamp() )
+					];
+				}
+				unset( $warnings['duplicate-version'] );
+
+				ApiResult::setIndexedTagName( $dupes, 'ver' );
+				$warnings['duplicateversions'] = $dupes;
+			}
 		}
 
 		return $warnings;
@@ -735,7 +786,7 @@ class ApiUpload extends ApiBase {
 			$this->mParams['text'] = $this->mParams['comment'];
 		}
 
-		/** @var $file File */
+		/** @var $file LocalFile */
 		$file = $this->mUpload->getLocalFile();
 
 		// For preferences mode, we want to watch if 'watchdefault' is set,