From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 3 Jun 2011 03:38:52 +0000 (+0000)
Subject: Kill $wgWikiFarm. Only use in a wmf code path, and I can't find any evidence of this... 
X-Git-Tag: 1.31.0-rc.0~29757
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=4081fcabad213e1ca28da98d659f542aa499d122;p=lhc%2Fweb%2Fwiklou.git

Kill $wgWikiFarm. Only use in a wmf code path, and I can't find any evidence of this being use in WMF anywhere.
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index fd886569ce..7aff84d579 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -929,9 +929,8 @@ abstract class Maintenance {
 	 * @return String
 	 */
 	public function loadSettings() {
-		global $wgWikiFarm, $wgCommandLineMode, $IP;
+		global $wgCommandLineMode, $IP;
 
-		$wgWikiFarm = false;
 		if ( isset( $this->mOptions['conf'] ) ) {
 			$settingsFile = $this->mOptions['conf'];
 		} else if ( defined("MW_CONFIG_FILE") ) {
diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 12fbb49a9a..bf95da1e79 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -80,7 +80,6 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 	# @todo FIXME: Wikimedia-specific stuff needs to go away to an ext
 	# Maybe a hook?
 	global $cluster;
-	$wgWikiFarm = true;
 	$cluster = 'pmtpa';
 	require_once( MWInit::compiledPath( 'includes/SiteConfiguration.php' ) );
 	require( MWInit::interpretedPath( 'wmf-config/wgConf.php' ) );