Some HipHop fixes:

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

diff --git a/maintenance/upgrade1_5.php b/maintenance/upgrade1_5.php
index 0b2836c..709d0b2 100644 (file)
--- a/maintenance/upgrade1_5.php
+++ b/maintenance/upgrade1_5.php
@@ -101,7 +101,6 @@ class FiveUpgrade extends Maintenance {
 
                $this->cleanupSwaps = array();
                $this->emailAuth = false; # don't preauthenticate emails
-               $this->maxLag    = 10; # if slaves are lagged more than 10 secs, wait
                $this->step      = $this->getOption( 'step', null );
        }
 
@@ -316,7 +315,7 @@ class FiveUpgrade extends Maintenance {
         */
        function insertChunk( &$chunk ) {
                // Give slaves a chance to catch up
-               wfWaitForSlaves( $this->maxLag );
+               wfWaitForSlaves();
                $this->dbw->insert( $this->chunkTable, $chunk, $this->chunkFunction, $this->chunkOptions );
        }
 
@@ -1325,4 +1324,4 @@ END
 }
 
 $maintClass = 'FiveUpgrade';
-require( DO_MAINTENANCE );
+require( RUN_MAINTENANCE_IF_MAIN );