From cecb985bee3bdd252e1b8dc0bd500b37cd52be01 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 16 May 2007 20:58:53 +0000
Subject: Aktualisierung auf MediaWiki 1.10.0 Plugins angepasst und verbessert
 kleine Korrekturen am Design

---
 maintenance/fixSlaveDesync.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'maintenance/fixSlaveDesync.php')

diff --git a/maintenance/fixSlaveDesync.php b/maintenance/fixSlaveDesync.php
index d2dffe54..aec77b1e 100644
--- a/maintenance/fixSlaveDesync.php
+++ b/maintenance/fixSlaveDesync.php
@@ -20,7 +20,7 @@ $reportingInterval = 1000;
 if ( isset( $args[0] ) ) {
 	desyncFixPage( $args[0] );
 } else {
-	$dbw =& wfGetDB( DB_MASTER );
+	$dbw = wfGetDB( DB_MASTER );
 	$maxPage = $dbw->selectField( 'page', 'MAX(page_id)', false, 'fixDesync.php' );
 	$corrupt = findPageLatestCorruption();
 	foreach ( $corrupt as $id => $dummy ) {
@@ -38,7 +38,7 @@ if ( isset( $args[0] ) ) {
 function findPageLatestCorruption() {
 	$desync = array();
 	$n = 0;
-	$dbw =& wfGetDB( DB_MASTER );
+	$dbw = wfGetDB( DB_MASTER );
 	$masterIDs = array();
 	$res = $dbw->select( 'page', array( 'page_id', 'page_latest' ), array( 'page_id<6054123' ), __METHOD__ );
 	print "Number of pages: " . $dbw->numRows( $res ) . "\n";
@@ -53,8 +53,7 @@ function findPageLatestCorruption() {
 	
 	global $slaveIndexes;
 	foreach ( $slaveIndexes as $i ) {
-		$slaveIDs = array();
-		$db =& wfGetDB( $i );
+		$db = wfGetDB( $i );
 		$res = $db->select( 'page', array( 'page_id', 'page_latest' ), array( 'page_id<6054123' ), __METHOD__ );
 		while ( $row = $db->fetchObject( $res ) ) {
 			if ( isset( $masterIDs[$row->page_id] ) && $masterIDs[$row->page_id] != $row->page_latest ) {
@@ -73,14 +72,14 @@ function desyncFixPage( $pageID ) {
 	$fname = 'desyncFixPage';
 
 	# Check for a corrupted page_latest
-	$dbw =& wfGetDB( DB_MASTER );
+	$dbw = wfGetDB( DB_MASTER );
 	$dbw->begin();
 	$realLatest = $dbw->selectField( 'page', 'page_latest', array( 'page_id' => $pageID ), 
 		$fname, 'FOR UPDATE' );
 	#list( $masterFile, $masterPos ) = $dbw->getMasterPos();
 	$found = false;
 	foreach ( $slaveIndexes as $i ) {
-		$db =& wfGetDB( $i );
+		$db = wfGetDB( $i );
 		/*
 		if ( !$db->masterPosWait( $masterFile, $masterPos, 10 ) ) {
 		       echo "Slave is too lagged, aborting\n";
@@ -122,7 +121,6 @@ function desyncFixPage( $pageID ) {
 		if ( count( $missingIDs ) ) {
 			print "Found " . count( $missingIDs ) . " lost in master, copying from slave... ";
 			$dbFrom = $db;
-			$dbTo = $dbw;
 			$found = true;
 			$toMaster = true;
 		} else {
@@ -133,7 +131,6 @@ function desyncFixPage( $pageID ) {
 		if ( count( $missingIDs ) ) {
 			print "Found " . count( $missingIDs ) . " missing revision(s), copying from master... ";
 			$dbFrom = $dbw;
-			$dbTo = $db;
 			$found = true;
 			$toMaster = false;
 		} else {
@@ -158,7 +155,7 @@ function desyncFixPage( $pageID ) {
 				}
 			} else {
 				foreach ( $slaveIndexes as $i ) {
-					$db =& wfGetDB( $i );
+					$db = wfGetDB( $i );
 					$db->insert( 'revision', get_object_vars( $row ), $fname, 'IGNORE' );
 				}
 			}
@@ -169,7 +166,7 @@ function desyncFixPage( $pageID ) {
 				$dbw->insert( 'text', get_object_vars( $row ), $fname, 'IGNORE' );
 			} else {
 				foreach ( $slaveIndexes as $i ) {
-					$db =& wfGetDB( $i );
+					$db = wfGetDB( $i );
 					$db->insert( 'text', get_object_vars( $row ), $fname, 'IGNORE' );
 				}
 			}
@@ -183,7 +180,7 @@ function desyncFixPage( $pageID ) {
 			#$dbw->update( 'page', array( 'page_latest' => $realLatest ), array( 'page_id' => $pageID ), $fname );
 		} else {
 			foreach ( $slaveIndexes as $i ) {
-				$db =& wfGetDB( $i );
+				$db = wfGetDB( $i );
 				$db->update( 'page', array( 'page_latest' => $realLatest ), array( 'page_id' => $pageID ), $fname );
 			}
 		}
-- 
cgit v1.2.3-54-g00ecf