tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Undefined index: HTTP_ACCEPT_LANGUAGE 

fixes #8370
This commit is contained in:
Eric Lippmann 2015-03-11 20:50:05 +01:00
parent ba0154ab79
commit d102a61e22
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Application/Web.php
View File

@ -314,13 +314,15 @@ class Web extends ApplicationBootstrap
protected function detectLocale() protected function detectLocale()
{ {
$auth = Manager::getInstance(); $auth = Manager::getInstance();
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$auth->isAuthenticated() if ($auth->isAuthenticated()
|| ($locale = $auth->getUser()->getPreferences()->getValue('icingaweb', 'language')) === null && ($locale = $auth->getUser()->getPreferences()->getValue('icingaweb', 'language')) !== null
) { ) {
$locale = Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE']); return $locale;
} }
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
return $locale; return Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE']);
}
return Translator::DEFAULT_LOCALE;
} }
/** /**