From 1e26c777493898271e2000256f798a0aebadf63f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Robert=20Stojni=C4=87?= Date: Mon, 14 Jul 2008 22:20:31 +0000 Subject: [PATCH] Sequel to r37662: avoid infinite recursion in User when default params are used. --- languages/LanguageConverter.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index c2c95235a1..dd9f85718a 100644 --- 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 -- 2.20.1