Merge "[FileBackend] Added getLocalCopyMulti() and getLocalReferenceMulti()."

[lhc/web/wiklou.git] / maintenance / storage / moveToExternal.php

diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php
index 5ce225c..2dcc25c 100644 (file)
--- a/maintenance/storage/moveToExternal.php
+++ b/maintenance/storage/moveToExternal.php
@@ -24,8 +24,8 @@
 define( 'REPORTING_INTERVAL', 1 );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
-       require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
-       require_once( dirname( __FILE__ ) . '/../../includes/ExternalStoreDB.php' );
+       require_once( __DIR__ . '/../commandLine.inc' );
+       require_once( __DIR__ . '/../../includes/ExternalStoreDB.php' );
        require_once( 'resolveStubs.php' );
 
        $fname = 'moveToExternal';
@@ -66,7 +66,7 @@ function moveToExternal( $cluster, $maxID, $minID = 1 ) {
 
                if ( !( $block % REPORTING_INTERVAL ) ) {
                        print "oldid=$blockStart, moved=$numMoved\n";
-                       wfWaitForSlaves( 2 );
+                       wfWaitForSlaves();
                }
 
                $res = $dbr->select( 'text', array( 'old_id', 'old_flags', 'old_text' ),