From 4081fcabad213e1ca28da98d659f542aa499d122 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Fri, 3 Jun 2011 03:38:52 +0000 Subject: [PATCH] Kill $wgWikiFarm. Only use in a wmf code path, and I can't find any evidence of this being use in WMF anywhere. --- maintenance/Maintenance.php | 3 +-- maintenance/doMaintenance.php | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) 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' ) ); -- 2.20.1