From 8dad63de0294c4d385069afccbba307c2b8cf9e5 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 11 Nov 2020 23:03:15 +0100 Subject: Fix initI18n (#3249) * Fix initI18n #fix https://github.com/FreshRSS/FreshRSS/issues/3246#issuecomment-725463337 #fix https://github.com/FreshRSS/FreshRSS/issues/3136 It was due to calling `initI18n()` before `FreshRSS_Context` is intialised in some situations Introduced by https://github.com/FreshRSS/FreshRSS/pull/3022 Will be better fixed when https://github.com/FreshRSS/FreshRSS/pull/3070 lands * Fallback condition --- app/FreshRSS.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/FreshRSS.php b/app/FreshRSS.php index e4cc3936c..5b16e3f89 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -90,8 +90,9 @@ class FreshRSS extends Minz_FrontController { } private static function initI18n() { - $selected_language = FreshRSS_Auth::hasAccess() ? FreshRSS_Context::$user_conf->language : null; - $language = Minz_Translate::getLanguage($selected_language, Minz_Request::getPreferredLanguages(), FreshRSS_Context::$system_conf->language); + $userLanguage = isset(FreshRSS_Context::$user_conf) ? FreshRSS_Context::$user_conf->language : null; + $systemLanguage = isset(FreshRSS_Context::$system_conf) ? FreshRSS_Context::$system_conf->language : null; + $language = Minz_Translate::getLanguage($userLanguage, Minz_Request::getPreferredLanguages(), $systemLanguage); Minz_Session::_param('language', $language); Minz_Translate::init($language); -- cgit v1.2.3