Stupid merge conflicts, fix r96537

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 0fe8140..6b29c5f 100644 (file)
--- 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" ) )