diff options
| author | Matt Friedman <maf675@gmail.com> | 2014-04-07 09:14:58 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2014-04-07 09:14:58 -0700 |
| commit | daae87d65a20664af09a002f90483cc75e84d01f (patch) | |
| tree | e5b65105f6f7fe69910885fde2a84a7bb0b2ebc7 /phpBB/includes/ucp/ucp_register.php | |
| parent | a5940ede5bc8a7594b84fd4b489ada2110ecbdcc (diff) | |
| download | forums-daae87d65a20664af09a002f90483cc75e84d01f.tar forums-daae87d65a20664af09a002f90483cc75e84d01f.tar.gz forums-daae87d65a20664af09a002f90483cc75e84d01f.tar.bz2 forums-daae87d65a20664af09a002f90483cc75e84d01f.tar.xz forums-daae87d65a20664af09a002f90483cc75e84d01f.zip | |
[ticket/12254] Use new set_lang var to avoid conflict with change_lang
PHPBB3-12254
Diffstat (limited to 'phpBB/includes/ucp/ucp_register.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index f866e8ec26..fe4eeec1ef 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -64,9 +64,7 @@ class ucp_register $agreed = false; } - $user->lang_name = $user_lang = $use_lang; - $user->data['user_lang'] = $user->lang_name; - $user->add_lang(array('common', 'ucp')); + $user_lang = $use_lang; } else { @@ -105,6 +103,7 @@ class ucp_register $s_hidden_fields = array_merge($s_hidden_fields, array( 'change_lang' => '', + 'set_lang' => $user_lang, )); // If we change the language, we want to pass on some more possible parameter. @@ -412,6 +411,7 @@ class ucp_register $s_hidden_fields = array_merge($s_hidden_fields, array( 'agreed' => 'true', 'change_lang' => 0, + 'set_lang' => $user_lang, )); if ($config['coppa_enable']) |