X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjobqueue%2Fjobs%2FAssembleUploadChunksJob.php;h=1e804c457535055f19c935f9162f186126ac9f9d;hb=f7429252f85c5835b291def55fc04b8196c1bb39;hp=395da22256ae2a80d0f0ae431465994a662d3e97;hpb=2a1fcd27c19913394c179cbe8be1a9e981d7f81b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/jobqueue/jobs/AssembleUploadChunksJob.php b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
index 395da22256..1e804c4575 100644
--- a/includes/jobqueue/jobs/AssembleUploadChunksJob.php
+++ b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
@@ -33,8 +33,11 @@ class AssembleUploadChunksJob extends Job {
 	}
 
 	public function run() {
-		/** @noinspection PhpUnusedLocalVariableInspection */
 		$scope = RequestContext::importScopedSession( $this->params['session'] );
+		$this->addTeardownCallback( function () use ( &$scope ) {
+			ScopedCallback::consume( $scope ); // T126450
+		} );
+
 		$context = RequestContext::getMain();
 		$user = $context->getUser();
 		try {
@@ -65,7 +68,7 @@ class AssembleUploadChunksJob extends Job {
 					$this->params['filekey'],
 					[ 'result' => 'Failure', 'stage' => 'assembling', 'status' => $status ]
 				);
-				$this->setLastError( $status->getWikiText() );
+				$this->setLastError( $status->getWikiText( false, false, 'en' ) );
 
 				return false;
 			}