From 34e0645068ede89bfdcf2acf1e934a716a1a8f52 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 8 Sep 2011 01:54:27 +0000 Subject: [PATCH] Stupid merge conflicts, fix r96537 --- maintenance/doMaintenance.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index 0fe814003b..6b29c5fd54 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -85,10 +85,8 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) { require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) ); } // Require the configuration (probably LocalSettings.php) - require( MWInit::interpretedPath( $maintenance->loadSettings() ) ); + require( $maintenance->loadSettings() ); } -// Require the configuration (probably LocalSettings.php) -require( $maintenance->loadSettings() ); if ( $maintenance->getDbType() === Maintenance::DB_ADMIN && is_readable( "$IP/AdminSettings.php" ) ) -- 2.20.1