Revert r97788

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

diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php
index d26c12e..3c6888a 100644 (file)
--- a/maintenance/fixSlaveDesync.php
+++ b/maintenance/fixSlaveDesync.php
@@ -27,9 +27,9 @@ class FixSlaveDesync extends Maintenance {
        }
 
        public function getDbType() {
-               return self::DB_ADMIN;
+               return Maintenance::DB_ADMIN;
        }
-       
+
        public function execute() {
                $this->slaveIndexes = array();
                for ( $i = 1; $i < wfGetLB()->getServerCount(); $i++ ) {
@@ -124,7 +124,7 @@ class FixSlaveDesync extends Maintenance {
                        $masterIDs[] = $row->rev_id;
                }
 
-               $res = $db->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ), __METHOD__ );
+               $res = $dbw->select( 'revision', array( 'rev_id' ), array( 'rev_page' => $pageID ), __METHOD__ );
                $slaveIDs = array();
                foreach ( $res as $row ) {
                        $slaveIDs[] = $row->rev_id;
@@ -133,7 +133,7 @@ class FixSlaveDesync extends Maintenance {
                        $missingIDs = array_diff( $slaveIDs, $masterIDs );
                        if ( count( $missingIDs ) ) {
                                $this->output( "Found " . count( $missingIDs ) . " lost in master, copying from slave... " );
-                               $dbFrom = $db;
+                               $dbFrom = $dbw;
                                $found = true;
                                $toMaster = true;
                        } else {
@@ -204,4 +204,4 @@ class FixSlaveDesync extends Maintenance {
 }
 
 $maintClass = "FixSlaveDesync";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );