From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 4 Mar 2016 20:05:12 +0000 (-0800)
Subject: Clarify FileRepo::concatenate() docs a bit
X-Git-Tag: 1.31.0-rc.0~7722^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=35907d886ef1dc05dbe5d09bdac1e081d535cdff;p=lhc%2Fweb%2Fwiklou.git

Clarify FileRepo::concatenate() docs a bit

Change-Id: I6d978a7e6c8a3671192c346eaef590aa3033cf99
---

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 789803f616..f3c2abf323 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -1115,7 +1115,7 @@ class FileRepo {
 	 * @param array $srcPaths Ordered list of source virtual URLs/storage paths
 	 * @param string $dstPath Target file system path
 	 * @param int $flags Bitwise combination of the following flags:
-	 *   self::DELETE_SOURCE     Delete the source files
+	 *   self::DELETE_SOURCE     Delete the source files on success
 	 * @return FileRepoStatus
 	 */
 	public function concatenate( array $srcPaths, $dstPath, $flags = 0 ) {
diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index d82a9e6f9f..8ee08458d2 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -145,6 +145,7 @@ class UploadFromChunks extends UploadFromFile {
 		if ( !$status->isOk() ) {
 			return $status;
 		}
+
 		wfDebugLog( 'fileconcatenate', "Combined $i chunks in $tAmount seconds." );
 
 		// File system path