http://www.mediawiki.org/wiki/Special:Code/MediaWiki/60523
Revision: 60523 Author: philip Date: 2009-12-31 17:14:59 +0000 (Thu, 31 Dec 2009) Log Message: ----------- bug 21974, don't return $this->mPreferredVariant if $fromUser = false Modified Paths: -------------- trunk/phase3/languages/LanguageConverter.php Modified: trunk/phase3/languages/LanguageConverter.php =================================================================== --- trunk/phase3/languages/LanguageConverter.php 2009-12-31 17:00:38 UTC (rev 60522) +++ trunk/phase3/languages/LanguageConverter.php 2009-12-31 17:14:59 UTC (rev 60523) @@ -133,7 +133,8 @@ 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 @@ } // 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 @@ } } } - return $this->mMainLanguageCode; } - else return $this->mPreferredVariant; - + return $this->mMainLanguageCode; } /** _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs