X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fupload%2FUploadFromChunks.php;h=0323b685b8674d1d8ae52b3a03d42b30bf636f16;hb=2f2797e53a60bcdb68b19543dd3258cc2f894617;hp=8ee08458d2505a44baa1d0daf5f635fdf4a5d52e;hpb=8f03f87f82b78908cf4281809c86bc7a26096c30;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index 8ee08458d2..0323b685b8 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -142,16 +142,15 @@ class UploadFromChunks extends UploadFromFile {
 		$tStart = microtime( true );
 		$status = $this->repo->concatenate( $fileList, $tmpPath, FileRepo::DELETE_SOURCE );
 		$tAmount = microtime( true ) - $tStart;
-		if ( !$status->isOk() ) {
+		if ( !$status->isOK() ) {
 			return $status;
 		}
 
 		wfDebugLog( 'fileconcatenate', "Combined $i chunks in $tAmount seconds." );
 
-		// File system path
-		$this->mTempPath = $tmpPath;
-		// Since this was set for the last chunk previously
-		$this->mFileSize = filesize( $this->mTempPath );
+		// File system path of the actual full temp file
+		$this->setTempFile( $tmpPath );
+
 		$ret = $this->verifyUpload();
 		if ( $ret['status'] !== UploadBase::OK ) {
 			wfDebugLog( 'fileconcatenate', "Verification failed for chunked upload" );
@@ -235,7 +234,7 @@ class UploadFromChunks extends UploadFromFile {
 		wfDebug( __METHOD__ . " update chunk status for {$this->mFileKey} offset:" .
 			$this->getOffset() . ' inx:' . $this->getChunkIndex() . "\n" );
 
-		$dbw = $this->repo->getMasterDb();
+		$dbw = $this->repo->getMasterDB();
 		// Use a quick transaction since we will upload the full temp file into shared
 		// storage, which takes time for large files. We don't want to hold locks then.
 		$dbw->update(
@@ -257,7 +256,7 @@ class UploadFromChunks extends UploadFromFile {
 	private function getChunkStatus() {
 		// get Master db to avoid race conditions.
 		// Otherwise, if chunk upload time < replag there will be spurious errors
-		$dbw = $this->repo->getMasterDb();
+		$dbw = $this->repo->getMasterDB();
 		$row = $dbw->selectRow(
 			'uploadstash',
 			[