Fix regreesion in r37662, disabled conversion when interface language variant is...

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 685cc9e..ec52e7f 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -147,7 +147,7 @@ class StubUserLang extends StubObject {
 
                // if variant is explicitely selected, use it instead the one from wgUser
                // see bug #7605
-               if( $wgContLang->hasVariants() && $code == $wgContLanguageCode ){
+               if( $wgContLang->hasVariants() && in_array($code, $wgContLang->getVariants()) ){
                        $variant = $wgContLang->getPreferredVariant();
                        if( $variant != $wgContLanguageCode )
                                $code = $variant;

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index dd9f857..bbf1597 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -131,7 +131,7 @@ class LanguageConverter {
                        $defaultUserLang = $this->mMainLanguageCode;
                $userLang = $wgRequest->getVal( 'uselang', $defaultUserLang );
                // see if interface language is same as content, if not, prevent conversion
-               if( $this->mMainLanguageCode != $userLang ){ 
+               if( ! in_array( $userLang, $this->mVariants ) ){ 
                        $this->mPreferredVariant = $this->mMainLanguageCode; // no conversion
                        return $this->mPreferredVariant;
                }