From: Fomafix <fomafix@googlemail.com>
Date: Mon, 28 Mar 2016 08:22:43 +0000 (+0000)
Subject: Replace deprecated language codes in user options
X-Git-Tag: 1.34.0-rc.0~5067^2
X-Git-Url: http://git.cyclocoop.org/data/%24%7Bnav_urls/portal//%27%40script%40/%27?a=commitdiff_plain;h=80f31ecac6ca70793341d1eba9300cfcf32b3178;p=lhc%2Fweb%2Fwiklou.git

Replace deprecated language codes in user options

This change replaces deprecated language codes in the user options by
the new language codes when loading the user setting from database.

The database entry for the user gets updated with the new language code
when the user saves the preferences.

Bug: T131042
Change-Id: I1dd6fb1f240ce3319b132d0f29f0622fba33e655
---

diff --git a/includes/user/User.php b/includes/user/User.php
index c5fa05a9a5..7ad2742db4 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -5497,6 +5497,11 @@ class User implements IDBAccessObject, UserIdentity {
 			}
 		}
 
+		// Replace deprecated language codes
+		$this->mOptions['language'] = LanguageCode::replaceDeprecatedCodes(
+			$this->mOptions['language']
+		);
+
 		$this->mOptionsLoaded = true;
 
 		Hooks::run( 'UserLoadOptions', [ $this, &$this->mOptions ] );