From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 8 Sep 2011 01:54:27 +0000 (+0000)
Subject: Stupid merge conflicts, fix r96537
X-Git-Tag: 1.31.0-rc.0~27807
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=34e0645068ede89bfdcf2acf1e934a716a1a8f52;p=lhc%2Fweb%2Fwiklou.git

Stupid merge conflicts, fix r96537
---

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" ) )