Merge "Do not raise a PHP warning when session write fails"

[lhc/web/wiklou.git] / maintenance / syncFileBackend.php

diff --git a/maintenance/syncFileBackend.php b/maintenance/syncFileBackend.php
index b9493cd..63d5e9f 100644 (file)
--- a/maintenance/syncFileBackend.php
+++ b/maintenance/syncFileBackend.php
@@ -159,6 +159,7 @@ class SyncFileBackend extends Maintenance {
                        $this->error( "Error: given starting ID greater than ending ID.", 1 );
                }
 
+               $next = null;
                do {
                        $limit = min( $this->mBatchSize, $end - $start + 1 ); // don't go pass ending ID
                        $this->output( "Doing id $start to " . ( $start + $limit - 1 ) . "...\n" );
@@ -280,6 +281,7 @@ class SyncFileBackend extends Maintenance {
         * Substitute the backend name of storage paths with that of a given one
         *
         * @param array|string $paths List of paths or single string path
+        * @param FileBackend $backend
         * @return array|string
         */
        protected function replaceNamePaths( $paths, FileBackend $backend ) {