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

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index fd88656..7aff84d 100644 (file)
--- 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 12fbb49..bf95da1 100644 (file)
--- 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' ) );