aboutsummaryrefslogtreecommitdiffstats
path: root/include/user.inc.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2014-09-30 08:23:34 +0000
committerplegall <plg@piwigo.org>2014-09-30 08:23:34 +0000
commit18f045bf35ebc5ff9cfb8ef79a0a3318db1b6903 (patch)
tree192b6c4696c6481399f5634b6222c8cbef057d02 /include/user.inc.php
parent7e5722ce78f89e4f7dbd91a8785b449aa122878b (diff)
bug 3111: cleaner code for get_browser_language (no more reference as parameter)
git-svn-id: http://piwigo.org/svn/trunk@29840 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/user.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/user.inc.php b/include/user.inc.php
index d1bf87c70..4de5cc6c3 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -68,9 +68,9 @@ if ($conf['apache_authentication'])
$user = build_user( $user['id'],
( defined('IN_ADMIN') and IN_ADMIN ) ? false : true // use cache ?
);
-if ($conf['browser_language'] and (is_a_guest() or is_generic()) )
+if ($conf['browser_language'] and (is_a_guest() or is_generic()) and $language = get_browser_language())
{
- get_browser_language($user['language']);
+ $user['language'] = $language;
}
trigger_notify('user_init', $user);
?>