r89388 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r89387‎ | r89388 | r89389 >
Date:03:38, 3 June 2011
Author:demon
Status:ok
Tags:
Comment:
Kill $wgWikiFarm. Only use in a wmf code path, and I can't find any evidence of this being use in WMF anywhere.
Modified paths:
  • /trunk/phase3/maintenance/Maintenance.php (modified) (history)
  • /trunk/phase3/maintenance/doMaintenance.php (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/Maintenance.php
@@ -929,9 +929,8 @@
930930 * @return String
931931 */
932932 public function loadSettings() {
933 - global $wgWikiFarm, $wgCommandLineMode, $IP;
 933+ global $wgCommandLineMode, $IP;
934934
935 - $wgWikiFarm = false;
936935 if ( isset( $this->mOptions['conf'] ) ) {
937936 $settingsFile = $this->mOptions['conf'];
938937 } else if ( defined("MW_CONFIG_FILE") ) {
Index: trunk/phase3/maintenance/doMaintenance.php
@@ -80,7 +80,6 @@
8181 # @todo FIXME: Wikimedia-specific stuff needs to go away to an ext
8282 # Maybe a hook?
8383 global $cluster;
84 - $wgWikiFarm = true;
8584 $cluster = 'pmtpa';
8685 require_once( MWInit::compiledPath( 'includes/SiteConfiguration.php' ) );
8786 require( MWInit::interpretedPath( 'wmf-config/wgConf.php' ) );

Follow-up revisions

RevisionCommit summaryAuthorDate
r89390Minor tweaks:...demon03:48, 3 June 2011

Status & tagging log