mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00
Code Issues Releases Wiki Activity

[ticket/12254] Use new set_lang var to avoid conflict with change_lang

Browse Source 
PHPBB3-12254
This commit is contained in:
Matt Friedman
2014-04-07 09:14:58 -07:00
parent a5940ede5b
commit daae87d65a
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/ucp/ucp_register.php
View File

@@ -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'])