X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=maintenance%2FdoMaintenance.php;h=b5beef696ad39d1dc7b630fdbd8b4b46d8214bab;hb=417a83a1a3ddf374dff5a14d8a08cd4c6099d357;hp=e87e024918e6e4456cb26e2650d1b6893ecad1a6;hpb=32199ac8bc293efc5cbd41c3af7fe1055d04d11c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index e87e024918..b5beef696a 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -55,27 +55,30 @@ $maintenance->setup();
 // to $maintenance->mSelf. Keep that here for b/c
 $self = $maintenance->getName();
 
-require_once "$IP/includes/PreConfigSetup.php";
-
-if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
-	# Use a callback function to configure MediaWiki
-	call_user_func( MW_CONFIG_CALLBACK );
-} else {
-	// Require the configuration (probably LocalSettings.php)
-	require $maintenance->loadSettings();
+// Define how settings are loaded (e.g. LocalSettings.php)
+if ( !defined( 'MW_CONFIG_CALLBACK' ) && !defined( 'MW_CONFIG_FILE' ) ) {
+	define( 'MW_CONFIG_FILE', $maintenance->loadSettings() );
 }
 
-if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
-	if ( $wgLocalisationCacheConf['storeClass'] === false
-		&& ( $wgLocalisationCacheConf['store'] == 'db'
-			|| ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) )
-	) {
-		$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
+// Custom setup for Maintenance entry point
+if ( !defined( 'MW_SETUP_CALLBACK' ) ) {
+	function wfMaintenanceSetup() {
+		// @codingStandardsIgnoreLine MediaWiki.NamingConventions.ValidGlobalName.wgPrefix
+		global $maintenance, $wgLocalisationCacheConf, $wgCacheDirectory;
+		if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
+			if ( $wgLocalisationCacheConf['storeClass'] === false
+				&& ( $wgLocalisationCacheConf['store'] == 'db'
+					|| ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) )
+			) {
+				$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
+			}
+		}
+
+		$maintenance->finalSetup();
 	}
+	define( 'MW_SETUP_CALLBACK', 'wfMaintenanceSetup' );
 }
 
-$maintenance->finalSetup();
-// Some last includes
 require_once "$IP/includes/Setup.php";
 
 // Initialize main config instance