Fix Undefined index: HTTP_ACCEPT_LANGUAGE

fixes #8370
Icinga · Mar 11, 2015 · d102a61 · d102a61
1 parent ba0154a
commit d102a61
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
@@ -314,13 +314,15 @@ protected function detectTimezone()
     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;
     }
 
     /**