From db0bb8ae696a3d79f37ef3a13d6f70a7a01b50bf Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 16 Dec 2019 15:27:08 +0100 Subject: [PATCH] add a fallback locale for personal settings page otherwise if the locale is set to an invalid or no longer existing locale the rendering of the setting page will throw an exception Signed-off-by: Robin Appelman --- apps/settings/lib/Settings/Personal/PersonalInfo.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php index ee30987396..646ad04b23 100644 --- a/apps/settings/lib/Settings/Personal/PersonalInfo.php +++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php @@ -251,6 +251,13 @@ class PersonalInfo implements ISettings { return 0 === strpos($localeCode['code'], $userLang); }); + if (!$userLocale) { + $userLocale = [ + 'code' => 'en', + 'name' => 'English' + ]; + } + return [ 'activelocaleLang' => $userLocaleString, 'activelocale' => $userLocale,