Merge "Avoid "Incorrect user-level lock name " errors in Database lock() method"

diff --git a/languages/Language.php b/languages/Language.php
index 7747198..69f518b 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -4451,12 +4451,11 @@ class Language {
         * @return bool|string
         */
        public static function getFallbackFor( $code ) {
-               if ( $code === 'en' || !Language::isValidBuiltInCode( $code ) ) {
-                       return false;
-               } else {
-                       $fallbacks = self::getFallbacksFor( $code );
+               $fallbacks = self::getFallbacksFor( $code );
+               if ( $fallbacks ) {
                        return $fallbacks[0];
                }
+               return false;
        }
 
        /**