* (bug 10837) Language variants overrides languages other than the variant main language.

Explicitely forbid conversion when interface language is different than the main content language.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 028f602..1e47f50 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -432,6 +432,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   had stict standards issues with setFakeSlaveLag() and setFakeMaster().
 * (bug 451) Improve the phrase mappings of the Chinese converter arrays.
 * (bug 12487) Rights log is not fully internationalized
+* (bug 10837) Language variants no longer override other languages than base
 
 === API changes in 1.13 ===
 

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 07db880..685cc9e 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() ){
+               if( $wgContLang->hasVariants() && $code == $wgContLanguageCode ){
                        $variant = $wgContLang->getPreferredVariant();
                        if( $variant != $wgContLanguageCode )
                                $code = $variant;

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index edaf4d6..c2c9523 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -124,6 +124,14 @@ class LanguageConverter {
                if($this->mPreferredVariant)
                        return $this->mPreferredVariant;
 
+               // figure out user lang without constructing wgLang to avoid infinite recursion
+               $userLang = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
+               // see if interface language is same as content, if not, prevent conversion
+               if( $this->mMainLanguageCode != $userLang ){ 
+                       $this->mPreferredVariant = $this->mMainLanguageCode; // no conversion
+                       return $this->mPreferredVariant;
+               }
+
                // see if the preference is set in the request
                $req = $wgRequest->getText( 'variant' );
                if( in_array( $req, $this->mVariants ) ) {