From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 8 Apr 2008 20:24:31 +0000 (+0000)
Subject: Don't use $wgDBservers to get server ip, it isn't set on Wikimedia and return host... 
X-Git-Tag: 1.31.0-rc.0~48519
X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=f64888e85345931047904c1360f57cd9e97d8235;p=lhc%2Fweb%2Fwiklou.git

Don't use $wgDBservers to get server ip, it isn't set on Wikimedia and return host="" for all db servers
---

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index b0ea015f86..eff3dc600f 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -195,12 +195,12 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 		if ($includeAll) {
 			if (!$wgShowHostnames)
 				$this->dieUsage('Cannot view all servers info unless $wgShowHostnames is true', 'includeAllDenied');
-			
-			global $wgDBservers;
-			$lags = wfGetLB()->getLagTimes();
+
+			$lb = wfGetLB();
+			$lags = $lb->getLagTimes();
 			foreach( $lags as $i => $lag ) {
 				$data[] = array (
-					'host' => $wgDBservers[$i]['host'],
+					'host' => $lb->getServerName( $i ),
 					'lag' => $lag);
 			}
 		} else {