X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=blobdiff_plain;f=includes%2Fcache%2Flocalisation%2FLocalisationCache.php;h=f20637a42017176a67b9d1aa81c279ce9612e91a;hb=d0463178dfa09b79b3a08fee939da1beed030824;hp=9cf7acf6f152e37e56a57985fb6eb8a0e5d8b03b;hpb=f7b003a0ed288b70d4267fe4a5f71b4fa242fdd7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/cache/localisation/LocalisationCache.php b/includes/cache/localisation/LocalisationCache.php
index 9cf7acf6f1..f20637a420 100644
--- a/includes/cache/localisation/LocalisationCache.php
+++ b/includes/cache/localisation/LocalisationCache.php
@@ -525,15 +525,20 @@ class LocalisationCache {
 		ini_set( 'apc.cache_by_default', $_apcEnabled );
 		Wikimedia\restoreWarnings();
 
+		$data = [];
 		if ( $_fileType == 'core' || $_fileType == 'extension' ) {
-
-			// Lnguage files aren't required to contain all the possible variables, so suppress warnings
-			// when variables don't exist in tests
-			Wikimedia\suppressWarnings();
-			$data = compact( self::$allKeys );
-			Wikimedia\restoreWarnings();
+			foreach ( self::$allKeys as $key ) {
+				// Not all keys are set in language files, so
+				// check they exist first
+				if ( isset( $$key ) ) {
+					$data[$key] = $$key;
+				}
+			}
 		} elseif ( $_fileType == 'aliases' ) {
-			$data = compact( 'aliases' );
+			if ( isset( $aliases ) ) {
+				/** @suppress PhanUndeclaredVariable */
+				$data['aliases'] = $aliases;
+			}
 		} else {
 			throw new MWException( __METHOD__ . ": Invalid file type: $_fileType" );
 		}
@@ -838,17 +843,23 @@ class LocalisationCache {
 		}
 
 		# Fill in the fallback if it's not there already
-		if ( is_null( $coreData['fallback'] ) ) {
-			$coreData['fallback'] = $code === 'en' ? false : 'en';
-		}
-		if ( $coreData['fallback'] === false ) {
-			$coreData['fallbackSequence'] = [];
+		if ( ( is_null( $coreData['fallback'] ) || $coreData['fallback'] === false ) && $code === 'en' ) {
+			$coreData['fallback'] = false;
+			$coreData['originalFallbackSequence'] = $coreData['fallbackSequence'] = [];
 		} else {
-			$coreData['fallbackSequence'] = array_map( 'trim', explode( ',', $coreData['fallback'] ) );
+			if ( !is_null( $coreData['fallback'] ) ) {
+				$coreData['fallbackSequence'] = array_map( 'trim', explode( ',', $coreData['fallback'] ) );
+			} else {
+				$coreData['fallbackSequence'] = [];
+			}
 			$len = count( $coreData['fallbackSequence'] );
 
-			# Ensure that the sequence ends at en
-			if ( $coreData['fallbackSequence'][$len - 1] !== 'en' ) {
+			# Before we add the 'en' fallback for messages, keep a copy of
+			# the original fallback sequence
+			$coreData['originalFallbackSequence'] = $coreData['fallbackSequence'];
+
+			# Ensure that the sequence ends at 'en' for messages
+			if ( !$len || $coreData['fallbackSequence'][$len - 1] !== 'en' ) {
 				$coreData['fallbackSequence'][] = 'en';
 			}
 		}