X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FInstaller.php;h=620cdf007ada9808c92491598a923a7764d6a8f0;hb=25be8cc5859e2f9f6560d6d1d52a47888023fbd6;hp=414222bc4538ab07be5216c4cbadc617d7527da5;hpb=3ce997ed65303c4f35216e7e7abb02c4718d8239;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 414222bc45..620cdf007a 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -412,17 +412,14 @@ 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' );
@@ -734,6 +731,7 @@ abstract class Installer {
 		if ( !$status->isOK() ) {
 			return $status;
 		}
+		// @phan-suppress-next-line PhanUndeclaredMethod
 		$status->value->insert(
 			'site_stats',
 			[
@@ -1273,7 +1271,7 @@ abstract class Installer {
 	 *
 	 * @param string $directory Directory to search in, relative to $IP, must be either "extensions"
 	 *     or "skins"
-	 * @return array [ $extName => [ 'screenshots' => [ '...' ] ]
+	 * @return array[][] [ $extName => [ 'screenshots' => [ '...' ] ]
 	 */
 	public function findExtensions( $directory = 'extensions' ) {
 		switch ( $directory ) {
@@ -1610,11 +1608,11 @@ abstract class Installer {
 
 			// If we've hit some sort of fatal, we need to bail.
 			// Callback already had a chance to do output above.
-			if ( !$status->isOk() ) {
+			if ( !$status->isOK() ) {
 				break;
 			}
 		}
-		if ( $status->isOk() ) {
+		if ( $status->isOK() ) {
 			$this->showMessage(
 				'config-install-db-success'
 			);