X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjobqueue%2Fjobs%2FAssembleUploadChunksJob.php;h=e2914be5e4dbad5ce5486f39e222c8856fd3235d;hb=264c8892d66b911498cc9d84f9f6fd288ddcceb2;hp=f3fcadf623d5620b31ae5415af186e5dd684d1e5;hpb=cb7837087dcade21c25d2fe2587ba693bb7fd0db;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/jobqueue/jobs/AssembleUploadChunksJob.php b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
index f3fcadf623..e2914be5e4 100644
--- a/includes/jobqueue/jobs/AssembleUploadChunksJob.php
+++ b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
@@ -20,6 +20,7 @@
  * @file
  * @ingroup Upload
  */
+use Wikimedia\ScopedCallback;
 
 /**
  * Assemble the segments of a chunked upload.
@@ -73,6 +74,10 @@ class AssembleUploadChunksJob extends Job {
 				return false;
 			}
 
+			// We can only get warnings like 'duplicate' after concatenating the chunks
+			$status = Status::newGood();
+			$status->value = [ 'warnings' => $upload->checkWarnings() ];
+
 			// We have a new filekey for the fully concatenated file
 			$newFileKey = $upload->getStashFile()->getFileKey();
 
@@ -95,7 +100,7 @@ class AssembleUploadChunksJob extends Job {
 					'stage' => 'assembling',
 					'filekey' => $newFileKey,
 					'imageinfo' => $imageInfo,
-					'status' => Status::newGood()
+					'status' => $status
 				]
 			);
 		} catch ( Exception $e ) {