From: Philip Tzou <philip@users.mediawiki.org>
Date: Thu, 31 Dec 2009 17:14:59 +0000 (+0000)
Subject: bug 21974, don't return $this->mPreferredVariant if $fromUser = false
X-Git-Tag: 1.31.0-rc.0~38446
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=d16a0c291027363a191383ab8a12c93dafe690a5;p=lhc%2Fweb%2Fwiklou.git

bug 21974, don't return $this->mPreferredVariant if $fromUser = false
---

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index e53933abf1..b54fcbc4a8 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -133,7 +133,8 @@ class LanguageConverter {
 	function getPreferredVariant( $fromUser = true, $fromHeader = false ) {
 		global $wgUser, $wgRequest, $wgVariantArticlePath, $wgDefaultLanguageVariant, $wgOut;
 
-		if($this->mPreferredVariant)
+		// bug 21974, don't return $this->mPreferredVariant if $fromUser = false
+		if( $fromUser && $this->mPreferredVariant )
 			return $this->mPreferredVariant;
 
 		// figure out user lang without constructing wgLang to avoid infinite recursion
@@ -175,7 +176,7 @@ class LanguageConverter {
 		}
 
 		// see if default variant is globaly set
-		if($wgDefaultLanguageVariant != false  &&  in_array( $wgDefaultLanguageVariant, $this->mVariants )){
+		if($wgDefaultLanguageVariant != false && in_array( $wgDefaultLanguageVariant, $this->mVariants )){
 			$this->mPreferredVariant = $wgDefaultLanguageVariant;
 			return $this->mPreferredVariant;
 		}
@@ -230,10 +231,8 @@ class LanguageConverter {
 					}
 				}
 			}
-			return $this->mMainLanguageCode;
 		}
-		else return $this->mPreferredVariant;
-
+		return $this->mMainLanguageCode;
 	}
 	
 	/**