- fix some side effects with browser language (wrong display/user creation in admin and mails to admin in user browser language)

git-svn-id: http://piwigo.org/svn/trunk@2425 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 2 insertions, 2 deletions

diff --git a/include/user.inc.php b/include/user.inc.php
index 1cb9ce7c0..9d7d2f242 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -69,9 +69,9 @@ if ($conf['apache_authentication'] and isset($_SERVER['REMOTE_USER']))
 $user = build_user( $user['id'],
           ( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ?
          );
-if (is_a_guest() or is_generic())
+if ($conf['browser_language'] and (is_a_guest() or is_generic()) )
 {
-  $user['language'] = get_default_language();
+  get_browser_language($user['language']);
 }
 trigger_action('user_init', $user);
 ?>