X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=f84b974071dc8b1fa452765409e8cfc64c89ff81;hp=b830b7006a6efb97cab8b47daa155408dafc66af;hb=326d52f9613c5227d75f97361be6ec6ef78b214e;hpb=7f1b20d832a52ee7ce573361c6647e6dde93a538 diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index b830b7006a..f84b974071 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -412,14 +412,17 @@ abstract class Installer { // This will be overridden in the web installer with the user-specified language RequestContext::getMain()->setLanguage( 'en' ); - // Disable the i18n cache - // TODO: manage LocalisationCache singleton in MediaWikiServices - Language::getLocalisationCache()->disableBackend(); - // Disable all global services, since we don't have any configuration yet! MediaWikiServices::disableStorageBackend(); $mwServices = MediaWikiServices::getInstance(); + + // Disable i18n cache + $mwServices->getLocalisationCache()->disableBackend(); + + // Clear language cache so the old i18n cache doesn't sneak back in + Language::clearCaches(); + // Disable object cache (otherwise CACHE_ANYTHING will try CACHE_DB and // SqlBagOStuff will then throw since we just disabled wfGetDB) $wgObjectCaches = $mwServices->getMainConfig()->get( 'ObjectCaches' ); @@ -1820,6 +1823,10 @@ abstract class Installer { // Don't try to use any object cache for SessionManager either. $GLOBALS['wgSessionCacheType'] = CACHE_NONE; + + // Set a dummy $wgServer to bypass the check in Setup.php, the + // web installer will automatically detect it and not use this value. + $GLOBALS['wgServer'] = 'https://🌻.invalid'; } /**