Fix operator precedence when detecting the default locale

fixes #8370
2015-03-04 08:28:30 +01:00 · 2015-03-04 08:28:30 +01:00 · 6e61980dd2
parent e2887df03e
commit 6e61980dd2
1 changed files with 2 additions and 2 deletions
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@ -314,12 +314,12 @@ class Web extends ApplicationBootstrap
    protected function detectLocale()
    {
        $auth = Manager::getInstance();
-        if (! $auth->isAuthenticated()
+        if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$auth->isAuthenticated()
            || ($locale = $auth->getUser()->getPreferences()->getValue('icingaweb', 'language')) === null
-            && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])
        ) {
            $locale = Translator::getPreferredLocaleCode($_SERVER['HTTP_ACCEPT_LANGUAGE']);
        }
+
        return $locale;
    }