Fix syntax error from r55287

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

diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php
index 57999a5..c585beb 100644 (file)
--- a/maintenance/fixSlaveDesync.php
+++ b/maintenance/fixSlaveDesync.php
@@ -22,15 +22,16 @@ require_once( dirname(__FILE__) . '/Maintenance.php' );
 
 class FixSlaveDesync extends Maintenance {
        public function __construct() {
+               global $wgUseRootUser;
+               $wgUseRootUser = true;
+
                parent::__construct();
                $this->mDescription = "";
                
        }
        
        public function execute() {
-               global $wgUseRootUser, $wgDBservers;
-               $wgUseRootUser = true;
-
+               global $slaveIndexes, $wgDBservers;
                $slaveIndexes = array();
                for ( $i = 1; $i < count( $wgDBservers ); $i++ ) {
                        if ( wfGetLB()->isNonZeroLoad( $i ) ) {
@@ -61,7 +62,7 @@ class FixSlaveDesync extends Maintenance {
                $masterIDs = array();
                $res = $dbw->select( 'page', array( 'page_id', 'page_latest' ), array( 'page_id<6054123' ), __METHOD__ );
                $this->output( "Number of pages: " . $dbw->numRows( $res ) . "\n" );
-               while ( $row = $dbw->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $masterIDs[$row->page_id] = $row->page_latest;
                        if ( !( ++$n % 10000 ) ) {
                                $this->output( "$n\r" );
@@ -74,7 +75,7 @@ class FixSlaveDesync extends Maintenance {
                foreach ( $slaveIndexes as $i ) {
                        $db = wfGetDB( $i );
                        $res = $db->select( 'page', array( 'page_id', 'page_latest' ), array( 'page_id<6054123' ), __METHOD__ );
-                       while ( $row = $db->fetchObject( $res ) ) {
+                       foreach ( $res as $row ) {
                                if ( isset( $masterIDs[$row->page_id] ) && $masterIDs[$row->page_id] != $row->page_latest ) {
                                        $desync[$row->page_id] = true;
                                        $this->output( $row->page_id . "\t" );
@@ -127,14 +128,14 @@ class FixSlaveDesync extends Maintenance {
                $res = $dbw->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ), 
                        __METHOD__, 'FOR UPDATE' );
                $masterIDs = array();
-               while ( $row = $dbw->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $masterIDs[] = $row->rev_id;
                }
                $dbw->freeResult( $res );
 
                $res = $db->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ), __METHOD__ );
                $slaveIDs = array();
-               while ( $row = $db->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $slaveIDs[] = $row->rev_id;
                }
                $db->freeResult( $res );