1 files changed, 6 insertions, 3 deletions
diff --git a/localeDetection.class.php b/localeDetection.class.php
index d1b20357d..d2a3a089d 100644
--- a/localeDetection.class.php
+++ b/localeDetection.class.php
@@ -27,9 +27,12 @@ class ChooseLocale
 
     public function __construct($list=array('en-US'), $force_http_accept_language = null)
     {
-        $this -> HTTPAcceptLang   = is_null($force_http_accept_language) ?
-                                    $_SERVER['HTTP_ACCEPT_LANGUAGE'] :
-                                    $force_http_accept_language;
+        if (null !== $force_http_accept_language) {
+            $this -> HTTPAcceptLang = $force_http_accept_language;
+        } else if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            $this -> HTTPAcceptLang = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+        }
+
         $this -> supportedLocales = array_unique($list);
         $this -> setDefaultLocale('en-US');
         $this -> setCompatibleLocale();