Merge branch '2.8'

2026-03-28 17:42:57 +01:00 · 2016-10-20 10:43:41 +02:00
parent 21bb14db42 25d2305839
commit a9fa61adfe
1 changed files with 1 additions and 1 deletions
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -220,7 +220,7 @@ SELECT id
    }

    $override = array();
-    if ($language = get_browser_language())
+    if ($conf['browser_language'] and $language = get_browser_language())
    {
      $override['language'] = $language;
    }