aboutsummaryrefslogtreecommitdiffstats
path: root/include/user.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-07-05 22:36:39 +0000
committerrvelices <rv-github@modusoptimus.com>2008-07-05 22:36:39 +0000
commit03c2f3c8db54c8b3df8c344ac0ca7d7ffecac890 (patch)
tree883fef0934f468d20edb67a5430faa8475315535 /include/user.inc.php
parentf9927090e09be93a66c4705a760d94add583e84e (diff)
- 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
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 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);
?>