Merge "Implement static public Parser::getExternalLinkRel"

[lhc/web/wiklou.git] / includes / filerepo / FileRepo.php

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 5b03164..cbcc6c8 100644 (file)
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -988,10 +988,9 @@ class FileRepo {
         * @param $dstPath String Target file system path
         * @param $flags Integer: bitwise combination of the following flags:
         *     self::DELETE_SOURCE     Delete the source files
-        * @param $callback Closure Optional callback function (see FileBackend::concatenate())
         * @return FileRepoStatus
         */
-       public function concatenate( array $srcPaths, $dstPath, $flags = 0, Closure $callback = null ) {
+       public function concatenate( array $srcPaths, $dstPath, $flags = 0 ) {
                $this->assertWritableRepo(); // fail out if read-only
 
                $status = $this->newGood();
@@ -1004,7 +1003,7 @@ class FileRepo {
                }
 
                // Concatenate the chunks into one FS file
-               $params = array( 'srcs' => $sources, 'dst' => $dstPath, 'callback' => $callback );
+               $params = array( 'srcs' => $sources, 'dst' => $dstPath );
                $status->merge( $this->backend->concatenate( $params ) );
                if ( !$status->isOK() ) {
                        return $status;