makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 22:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12254] Use 'language' instead of 'set_lang' as the variable name

Browse source 
PHPBB3-12254
This commit is contained in:
Matt Friedman 2014-04-11 08:50:15 -07:00
parent af6cabc106
commit 60be502190
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/ucp/ucp_register.php
View file

@ -103,7 +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 != $config['default_lang']) ? $user_lang : '', 'language' => ($user_lang != $config['default_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.
@ -411,7 +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 != $config['default_lang']) ? $user_lang : '', 'language' => ($user_lang != $config['default_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('set_lang', ''); $change_lang = $request->variable('language', '');
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 .= '&set_lang=' . $user_lang_name; $SID .= '&language=' . $user_lang_name;
$_EXTRA_URL[] = 'set_lang=' . $user_lang_name; $_EXTRA_URL[] = 'language=' . $user_lang_name;
} }
else else
{ {

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

@ -11,7 +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'].language.value = lang_iso;
document.forms['register'].submit(); document.forms['register'].submit();
} }

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

@ -8,7 +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'].language.value = lang_iso;
document.forms['register'].submit.click(); document.forms['register'].submit.click();
} }
// ]]> // ]]>

2
phpBB/styles/subsilver2/template/ucp_agreement.html
View file

@ -11,7 +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'].language.value = lang_iso;
document.forms['register'].submit(); document.forms['register'].submit();
} }

2
phpBB/styles/subsilver2/template/ucp_register.html
View file

@ -8,7 +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'].language.value = lang_iso;
document.forms['register'].submit.click(); document.forms['register'].submit.click();
} }