From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 8 Sep 2011 01:52:36 +0000 (+0000)
Subject: Last fix for r96529, I swear...only CommonSettings.php needs interpretPath(). Core... 
X-Git-Tag: 1.31.0-rc.0~27808
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=51dcadd537baa9bc0aaf7b69fbbba866451e1afe;p=lhc%2Fweb%2Fwiklou.git

Last fix for r96529, I swear...only CommonSettings.php needs interpretPath(). Core loadSettings() already returns LocalSettings with $IP prefixed.
---

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 61f5d4084d..0fe814003b 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -87,6 +87,8 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 	// Require the configuration (probably LocalSettings.php)
 	require( MWInit::interpretedPath( $maintenance->loadSettings() ) );
 }
+// Require the configuration (probably LocalSettings.php)
+require( $maintenance->loadSettings() );
 
 if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
 	is_readable( "$IP/AdminSettings.php" ) )