* (bug 13010) Invalid language codes should fallback to default wiki language not...

Patch by Alexandre Emsenhuber

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 876cf50..aa72c36 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -105,7 +105,7 @@ class StubUserLang extends StubObject {
                        $code = $wgContLanguageCode;
                }
 
-               if( $code === $wgContLanguageCode ) {
+               if( $code === $wgContLanguageCode || !Language::localisationExist( $code ) ) {
                        return $wgContLang;
                } else {
                        $obj = Language::factory( $code );
@@ -135,3 +135,4 @@ class StubUser extends StubObject {
 }
 
 
+

diff --git a/languages/Language.php b/languages/Language.php
index d9aa5f5..67ad0ca 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2013,6 +2013,10 @@ class Language {
                return self::getFileName( "$IP/languages/classes/Language", $code, '.php' );
        }
        
+       static function localisationExist( $code ){
+               return ( file_exists( self::getMessagesFileName( $code ) ) || file_exists( self::getClassFileName( $code ) ) ); 
+       }
+       
        static function getLocalisationArray( $code, $disableCache = false ) {
                self::loadLocalisation( $code, $disableCache );
                return self::$mLocalisationCache[$code];