From 370e83bb0dfd0c70de268c93bf07ad5ee0897192 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 15 Aug 2008 01:29:47 +0200
Subject: Update auf 1.13.0

---
 maintenance/getSlaveServer.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'maintenance/getSlaveServer.php')

diff --git a/maintenance/getSlaveServer.php b/maintenance/getSlaveServer.php
index 9aca1043..25258267 100644
--- a/maintenance/getSlaveServer.php
+++ b/maintenance/getSlaveServer.php
@@ -1,13 +1,26 @@
 <?php
+/**
+ * This script reports the hostname of a slave server.
+ *
+ * @file
+ * @ingroup Maintenance
+ */
 
 require_once( dirname(__FILE__).'/commandLine.inc' );
 
+if ( $wgAllDBsAreLocalhost ) {
+	# Can't fool the backup script
+	print "localhost\n";
+	exit;
+}
+
 if( isset( $options['group'] ) ) {
 	$db = wfGetDB( DB_SLAVE, $options['group'] );
-	$host = $db->getProperty( 'mServer' );
+	$host = $db->getServer();
 } else {
-	$i = $wgLoadBalancer->getReaderIndex();
-	$host = $wgDBservers[$i]['host'];
+	$lb = wfGetLB();
+	$i = $lb->getReaderIndex();
+	$host = $lb->getServerName( $i );
 }
 
 print "$host\n";
-- 
cgit v1.2.2