X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguageConverter.php;h=3c8d300316c4125cfdf496fa39328b1c56350f22;hb=614dceed00bea7268bc3a2ddcd776e693ddb4b4d;hp=ea26c64dc7a47adc448749a8c146b8fc12fbe4c6;hpb=f35af6b719bd4b5c1119d5926daf69e8304e37d9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index ea26c64dc7..3c8d300316 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -140,10 +140,7 @@ class LanguageConverter {
 	 *   main code if there is no fallback
 	 */
 	public function getVariantFallbacks( $variant ) {
-		if ( isset( $this->mVariantFallbacks[$variant] ) ) {
-			return $this->mVariantFallbacks[$variant];
-		}
-		return $this->mMainLanguageCode;
+		return $this->mVariantFallbacks[$variant] ?? $this->mMainLanguageCode;
 	}
 
 	/**
@@ -212,9 +209,13 @@ class LanguageConverter {
 	}
 
 	/**
-	 * Validate the variant
+	 * Validate the variant and return an appropriate strict internal
+	 * variant code if one exists.  Compare to Language::hasVariant()
+	 * which does a strict test.
+	 *
 	 * @param string|null $variant The variant to validate
-	 * @return mixed Returns the variant if it is valid, null otherwise
+	 * @return mixed Returns an equivalent valid variant code if possible,
+	 *   null otherwise
 	 */
 	public function validateVariant( $variant = null ) {
 		if ( $variant === null ) {