Merge "(bug 40857) fix non-array sidebar links handling in CologneBlue"

[lhc/web/wiklou.git] / maintenance / doMaintenance.php

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index 12fbb49..2bb2a0f 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -74,27 +74,30 @@ require_once( MWInit::compiledPath( 'includes/DefaultSettings.php' ) );
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # Use a callback function to configure MediaWiki
        MWFunction::call( MW_CONFIG_CALLBACK );
-} elseif ( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) {
-       // Load settings, using wikimedia-mode if needed
-       // @todo FIXME: Replace this hack with general farm-friendly code
-       # @todo FIXME: Wikimedia-specific stuff needs to go away to an ext
-       # Maybe a hook?
-       global $cluster;
-       $wgWikiFarm = true;
-       $cluster = 'pmtpa';
-       require_once( MWInit::compiledPath( 'includes/SiteConfiguration.php' ) );
-       require( MWInit::interpretedPath( 'wmf-config/wgConf.php' ) );
-       $maintenance->loadWikimediaSettings();
-       require( MWInit::interpretedPath( '/wmf-config/CommonSettings.php' ) );
 } else {
-       require_once( $maintenance->loadSettings() );
+       if ( file_exists( "$IP/../wmf-config/wikimedia-mode" ) ) {
+               // Load settings, using wikimedia-mode if needed
+               // @todo FIXME: Replace this hack with general farm-friendly code
+               # @todo FIXME: Wikimedia-specific stuff needs to go away to an ext
+               # Maybe a hook?
+               global $cluster;
+               $cluster = 'pmtpa';
+               require( MWInit::interpretedPath( '../wmf-config/wgConf.php' ) );
+       }
+       // Require the configuration (probably LocalSettings.php)
+       require( $maintenance->loadSettings() );
 }
 
 if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
-               is_readable( "$IP/AdminSettings.php" ) )
+       is_readable( "$IP/AdminSettings.php" ) )
 {
        require( MWInit::interpretedPath( 'AdminSettings.php' ) );
 }
+
+if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
+       if ( $wgLocalisationCacheConf['storeClass'] === false && ( $wgLocalisationCacheConf['store'] == 'db' || ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) ) )
+               $wgLocalisationCacheConf['storeClass'] = 'LCStore_Null';
+}
 $maintenance->finalSetup();
 // Some last includes
 require_once( MWInit::compiledPath( 'includes/Setup.php' ) );