From 25d23058395ac83bdcfa5639c92de5f9e02acb58 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 20 Oct 2016 10:14:28 +0200
Subject: [PATCH] fixes #542, do not always use browser language on register

---
 include/functions_user.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index de8f87c7f..4c52576a5 100644
--- 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;
     }