Merge branch '2.8'

This commit is contained in:
plegall 2016-10-20 10:43:41 +02:00
commit a9fa61adfe

View file

@ -220,7 +220,7 @@ SELECT id
} }
$override = array(); $override = array();
if ($language = get_browser_language()) if ($conf['browser_language'] and $language = get_browser_language())
{ {
$override['language'] = $language; $override['language'] = $language;
} }