From 0ce3c66acd14cf8ec4a87118fa0b5dade1e09dc3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Robert=20Stojni=C4=87?= Date: Tue, 15 Jul 2008 16:49:57 +0000 Subject: [PATCH] Fix regreesion in r37662, disabled conversion when interface language variant is different that main wiki language variant. --- includes/StubObject.php | 2 +- languages/LanguageConverter.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/StubObject.php b/includes/StubObject.php index 685cc9e8c4..ec52e7f462 100644 --- 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 dd9f85718a..bbf15971f5 100644 --- 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; } -- 2.20.1