diff options
| author |   Graham Eames <grahamje@users.sourceforge.net> | 2006-06-08 21:11:04 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-08 21:11:04 +0000 |
| commit | 3ca51916a0e62d9bfeb73b7851a1ab2b664dcd80 (patch) | |
| tree | 953fc29af2c31ab2534b2affe546cda87beceb07 | |
| parent | .21 and added config var (diff) | |
| download | forums-3ca51916a0e62d9bfeb73b7851a1ab2b664dcd80.tar.gz forums-3ca51916a0e62d9bfeb73b7851a1ab2b664dcd80.tar.bz2 forums-3ca51916a0e62d9bfeb73b7851a1ab2b664dcd80.zip | |
Changes related to multiple language support (see announcement + bug #2137)
Thanks to Anthrax101 for the suggested code
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@6025 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6bd88390b..5fc5a27bc 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -368,10 +368,9 @@ function init_userprefs($userdata) message_die(CRITICAL_ERROR, 'Could not update user language info'); } - $board_config['default_lang'] = $default_lang; $userdata['user_lang'] = $default_lang; } - elseif ( $board_config['default_lang'] !== $default_lang ) + elseif ( $userdata['user_id'] === ANONYMOUS && $board_config['default_lang'] !== $default_lang ) { $sql = 'UPDATE ' . CONFIG_TABLE . " SET config_value = '" . $default_lang . "' @@ -381,10 +380,10 @@ function init_userprefs($userdata) { message_die(CRITICAL_ERROR, 'Could not update user language info'); } - - $board_config['default_lang'] = $default_lang; } + $board_config['default_lang'] = $default_lang; + include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); if ( defined('IN_ADMIN') ) |