Sequel to r37662: avoid infinite recursion in User when default params are used.

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index c2c9523..dd9f857 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -125,7 +125,11 @@ class LanguageConverter {
                        return $this->mPreferredVariant;
 
                // figure out user lang without constructing wgLang to avoid infinite recursion
-               $userLang = $wgRequest->getVal( 'uselang', $wgUser->getOption( 'language' ) );
+               if( $fromUser )
+                       $defaultUserLang = $wgUser->getOption( 'language' );
+               else
+                       $defaultUserLang = $this->mMainLanguageCode;
+               $userLang = $wgRequest->getVal( 'uselang', $defaultUserLang );
                // see if interface language is same as content, if not, prevent conversion
                if( $this->mMainLanguageCode != $userLang ){ 
                        $this->mPreferredVariant = $this->mMainLanguageCode; // no conversion