From 35907d886ef1dc05dbe5d09bdac1e081d535cdff Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 4 Mar 2016 12:05:12 -0800 Subject: [PATCH] Clarify FileRepo::concatenate() docs a bit Change-Id: I6d978a7e6c8a3671192c346eaef590aa3033cf99 --- includes/filerepo/FileRepo.php | 2 +- includes/upload/UploadFromChunks.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- 2.20.1