Some HipHop fixes:

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

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 6e4d12f..6b87f63 100644 (file)
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -150,7 +150,7 @@ abstract class FileRepo {
                return false;
        }
 
-       /*
+       /**
         * Find many files at once.
         * @param $items An array of titles, or an array of findFile() options with
         *    the "title" option giving the title. Example:
@@ -429,7 +429,8 @@ abstract class FileRepo {
 
 
        /**
-        * Append the contents of the source path to the given file.
+        * Append the contents of the source path to the given file, OR queue
+        * the appending operation in anticipation of a later appendFinish() call.
         * @param $srcPath String: location of the source file
         * @param $toAppendPath String: path to append to.
         * @param $flags Integer: bitfield, may be FileRepo::DELETE_SOURCE to indicate
@@ -438,6 +439,13 @@ abstract class FileRepo {
         */
        abstract function append( $srcPath, $toAppendPath, $flags = 0 );
 
+       /**
+        * Finish the append operation.
+        * @param $toAppendPath String: path to append to.
+        * @return mixed Status or false
+        */
+       abstract function appendFinish( $toAppendPath );
+
        /**
         * Remove a temporary file or mark it for garbage collection
         * @param $virtualUrl String: the virtual URL returned by storeTemp
@@ -598,7 +606,7 @@ abstract class FileRepo {
        function newFatal( $message /*, parameters...*/ ) {
                $params = func_get_args();
                array_unshift( $params, $this );
-               return call_user_func_array( array( 'FileRepoStatus', 'newFatal' ), $params );
+               return MWInit::callStaticMethod( 'FileRepoStatus', 'newFatal', $params );
        }
 
        /**