From d489ca4518affe0b8be33e0926768fdf0fe98619 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 8 Sep 2011 00:59:58 +0000 Subject: [PATCH] Another fix for r96529: using MW_CONFIG_CALLBACK should halt normal settings file loading. Broke command-line installer --- maintenance/doMaintenance.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index e8fe07e6ac..61f5d4084d 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -74,17 +74,19 @@ require_once( MWInit::compiledPath( 'includes/DefaultSettings.php' ) ); if ( defined( 'MW_CONFIG_CALLBACK' ) ) { # Use a callback function to configure MediaWiki MWFunction::call( MW_CONFIG_CALLBACK ); -} elseif ( file_exists( "$IP/../wmf-config/wikimedia-mode" ) ) { - // Load settings, using wikimedia-mode if needed - // @todo FIXME: Replace this hack with general farm-friendly code - # @todo FIXME: Wikimedia-specific stuff needs to go away to an ext - # Maybe a hook? - global $cluster; - $cluster = 'pmtpa'; - require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) ); +} else { + if ( file_exists( "$IP/../wmf-config/wikimedia-mode" ) ) { + // Load settings, using wikimedia-mode if needed + // @todo FIXME: Replace this hack with general farm-friendly code + # @todo FIXME: Wikimedia-specific stuff needs to go away to an ext + # Maybe a hook? + global $cluster; + $cluster = 'pmtpa'; + require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) ); + } + // Require the configuration (probably LocalSettings.php) + require( MWInit::interpretedPath( $maintenance->loadSettings() ) ); } -// Require the configuration (probably LocalSettings.php) -require( MWInit::interpretedPath( $maintenance->loadSettings() ) ); if ( $maintenance->getDbType() === Maintenance::DB_ADMIN && is_readable( "$IP/AdminSettings.php" ) ) -- 2.20.1