* Fix language selection for upgraded accounts [merge from 1.4]

diff --git a/includes/Setup.php b/includes/Setup.php
index aa9fa0d..d9d3ca2 100644 (file)
--- 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 962cc33..74cc649 100644 (file)
--- 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; }