From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 10 Mar 2016 20:04:54 +0000 (+0000)
Subject: Merge "Make UploadBase use TempFSFile to wrap the temporary file"
X-Git-Tag: 1.31.0-rc.0~7663
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=a25d6fbc285077bd3dc1ae8cc1fe50a3766b8ae7;p=lhc%2Fweb%2Fwiklou.git

Merge "Make UploadBase use TempFSFile to wrap the temporary file"
---

a25d6fbc285077bd3dc1ae8cc1fe50a3766b8ae7
diff --cc includes/upload/UploadFromChunks.php
index 8ee08458d2,aa23c7db96..ebb4ebb9e8
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@@ -145,13 -145,11 +145,12 @@@ class UploadFromChunks extends UploadFr
  		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" );