From 91690019804ca1f25c27105e35608d07a40c716b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 11 Dec 2004 09:57:58 +0000 Subject: [PATCH] * Fix language selection for upgraded accounts [merge from 1.4] --- includes/Setup.php | 5 +++++ includes/SpecialPreferences.php | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/includes/Setup.php b/includes/Setup.php index aa9fa0d867..d9d3ca2303 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -280,6 +280,11 @@ if( !$wgUser->mDataLoaded ) { // wgLanguageCode now specifically means the UI language $wgLanguageCode = $wgUser->getOption('language'); +if( empty( $wgLanguageCode ) ) { + # Quick hack for upgrades where this will be blank, + # and it's not handled right. Set to default. + $wgLanguageCode = $wgContLanguageCode; +} $wgLangClass = 'Language'. str_replace( '-', '_', ucfirst( $wgLanguageCode ) ); diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php index 962cc33e88..74cc649cc0 100644 --- a/includes/SpecialPreferences.php +++ b/includes/SpecialPreferences.php @@ -233,7 +233,12 @@ class PreferencesForm { $this->mOldpass = $this->mNewpass = $this->mRetypePass = ''; $this->mUserEmail = $wgUser->getEmail(); $this->mRealName = ($wgAllowRealName) ? $wgUser->getRealName() : ''; - $this->mUserLanguage = $wgUser->getOption( 'language'); + $this->mUserLanguage = $wgUser->getOption( 'language' ); + if( empty( $this->mUserLanguage ) ) { + # Quick hack for conversions, where this value is blank + global $wgContLanguageCode; + $this->mUserLanguage = $wgContLanguageCode; + } $this->mUserVariant = $wgUser->getOption( 'variant'); if ( 1 == $wgUser->getOption( 'disablemail' ) ) { $this->mEmailFlag = 1; } else { $this->mEmailFlag = 0; } -- 2.20.1