X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=091f93be3758eb6fbdc00f9797b7c6f20495772f;hp=b830b7006a6efb97cab8b47daa155408dafc66af;hb=fadd3277f73c8922cea2443a7e6566f54726fbbc;hpb=f97d13a10c1b7dac7c4463c3ccc75e21a731c7a2

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index b830b7006a..091f93be37 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' );