From 8d0dcbbad3275caa1a95b6c04268bb1dc49c7223 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 18 Jul 2011 17:23:56 +0000 Subject: [PATCH] Updated doMaintenance since wmf-config/ was moved up a dir --- maintenance/doMaintenance.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index b797de6b38..44e00032db 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -74,22 +74,22 @@ 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" ) ) { +} 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' ) ); + require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) ); $maintenance->loadWikimediaSettings(); - require( MWInit::interpretedPath( '/wmf-config/CommonSettings.php' ) ); + require( MWInit::interpretedPath( '../wmf-config/CommonSettings.php' ) ); } else { require_once( $maintenance->loadSettings() ); } if ( $maintenance->getDbType() === Maintenance::DB_ADMIN && - is_readable( "$IP/AdminSettings.php" ) ) + is_readable( "$IP/AdminSettings.php" ) ) { require( MWInit::interpretedPath( 'AdminSettings.php' ) ); } -- 2.20.1