makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 12:58:52 +00:00
Code Issues Projects Releases Packages 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
Show stats 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; $agreed = false;
} }
$user->lang_name = $user_lang = $use_lang; $user_lang = $use_lang;
$user->data['user_lang'] = $user->lang_name;
$user->add_lang(array('common', 'ucp'));
} }
else else
{ {
@ -105,6 +103,7 @@ class ucp_register
$s_hidden_fields = array_merge($s_hidden_fields, array( $s_hidden_fields = array_merge($s_hidden_fields, array(
'change_lang' => '', 'change_lang' => '',
'set_lang' => $user_lang,
)); ));
// If we change the language, we want to pass on some more possible parameter. // 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( $s_hidden_fields = array_merge($s_hidden_fields, array(
'agreed' => 'true', 'agreed' => 'true',
'change_lang' => 0, 'change_lang' => 0,
'set_lang' => $user_lang,
)); ));
if ($config['coppa_enable']) if ($config['coppa_enable'])

6
phpBB/phpbb/user.php
View file

@ -80,7 +80,7 @@ class user extends \phpbb\session
} }
else else
{ {
$change_lang = $request->variable('change_lang', ''); $change_lang = $request->variable('set_lang', '');
if ($change_lang) if ($change_lang)
{ {
global $SID, $_EXTRA_URL; global $SID, $_EXTRA_URL;
@ -88,8 +88,8 @@ class user extends \phpbb\session
$use_lang = basename($change_lang); $use_lang = basename($change_lang);
$user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']); $user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']);
$this->data['user_lang'] = $user_lang_name; $this->data['user_lang'] = $user_lang_name;
$SID .= '&change_lang=' . $user_lang_name; $SID .= '&set_lang=' . $user_lang_name;
$_EXTRA_URL[] = 'change_lang=' . $user_lang_name; $_EXTRA_URL[] = 'set_lang=' . $user_lang_name;
} }
else else
{ {

1
phpBB/styles/prosilver/template/ucp_agreement.html
View file

@ -11,6 +11,7 @@
function change_language(lang_iso) function change_language(lang_iso)
{ {
document.forms['register'].change_lang.value = lang_iso; document.forms['register'].change_lang.value = lang_iso;
document.forms['register'].set_lang.value = lang_iso;
document.forms['register'].submit(); document.forms['register'].submit();
} }

1
phpBB/styles/prosilver/template/ucp_register.html
View file

@ -8,6 +8,7 @@
function change_language(lang_iso) function change_language(lang_iso)
{ {
document.forms['register'].change_lang.value = lang_iso; document.forms['register'].change_lang.value = lang_iso;
document.forms['register'].set_lang.value = lang_iso;
document.forms['register'].submit.click(); document.forms['register'].submit.click();
} }
// ]]> // ]]>