From d102a61e2294bb19e156f07ae1612e115254bebc Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 11 Mar 2015 20:50:05 +0100 Subject: [PATCH] Fix Undefined index: HTTP_ACCEPT_LANGUAGE fixes #8370 --- library/Icinga/Application/Web.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php index 45dbc7e87..16f8d5131 100644 --- a/library/Icinga/Application/Web.php +++ b/library/Icinga/Application/Web.php @@ -314,13 +314,15 @@ class Web extends ApplicationBootstrap protected function detectLocale() { $auth = Manager::getInstance(); - if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$auth->isAuthenticated() - || ($locale = $auth->getUser()->getPreferences()->getValue('icingaweb', 'language')) === null + if ($auth->isAuthenticated() + && ($locale = $auth->getUser()->getPreferences()->getValue('icingaweb', 'language')) !== null ) { - $locale = Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE']); + return $locale; } - - return $locale; + if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { + return Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE']); + } + return Translator::DEFAULT_LOCALE; } /**