diff options
| author | Matt Friedman <maf675@gmail.com> | 2014-04-11 08:50:15 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2014-04-11 08:50:15 -0700 |
| commit | 60be5021900d0907ca65f83d11ae4f0b5ce090b0 (patch) | |
| tree | 4503c0d30b909e8f71cd0b8a1de2317acba5e86a | |
| parent | af6cabc1067b29850c1b037e878df2781e5c3de7 (diff) | |
| download | forums-60be5021900d0907ca65f83d11ae4f0b5ce090b0.tar forums-60be5021900d0907ca65f83d11ae4f0b5ce090b0.tar.gz forums-60be5021900d0907ca65f83d11ae4f0b5ce090b0.tar.bz2 forums-60be5021900d0907ca65f83d11ae4f0b5ce090b0.tar.xz forums-60be5021900d0907ca65f83d11ae4f0b5ce090b0.zip | |
[ticket/12254] Use 'language' instead of 'set_lang' as the variable name
PHPBB3-12254
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/user.php | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_agreement.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_register.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_agreement.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_register.html | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index b7f60304e1..e45a8d4bf3 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -103,7 +103,7 @@ class ucp_register $s_hidden_fields = array_merge($s_hidden_fields, array( '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. @@ -411,7 +411,7 @@ class ucp_register $s_hidden_fields = array_merge($s_hidden_fields, array( 'agreed' => 'true', 'change_lang' => 0, - 'set_lang' => ($user_lang != $config['default_lang']) ? $user_lang : '', + 'language' => ($user_lang != $config['default_lang']) ? $user_lang : '', )); if ($config['coppa_enable']) diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 36f72a69b9..628ddd8e59 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,7 +80,7 @@ class user extends \phpbb\session } else { - $change_lang = $request->variable('set_lang', ''); + $change_lang = $request->variable('language', ''); if ($change_lang) { global $SID, $_EXTRA_URL; @@ -88,8 +88,8 @@ class user extends \phpbb\session $use_lang = basename($change_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; - $SID .= '&set_lang=' . $user_lang_name; - $_EXTRA_URL[] = 'set_lang=' . $user_lang_name; + $SID .= '&language=' . $user_lang_name; + $_EXTRA_URL[] = 'language=' . $user_lang_name; } else { diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html index 5fabd40f9d..458f098b32 100644 --- a/phpBB/styles/prosilver/template/ucp_agreement.html +++ b/phpBB/styles/prosilver/template/ucp_agreement.html @@ -11,7 +11,7 @@ function change_language(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(); } diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 22314babff..0fe550a865 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -8,7 +8,7 @@ function change_language(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(); } // ]]> diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html index f2e904a66e..74c3d02dc7 100644 --- a/phpBB/styles/subsilver2/template/ucp_agreement.html +++ b/phpBB/styles/subsilver2/template/ucp_agreement.html @@ -11,7 +11,7 @@ function change_language(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(); } diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index 4d429f1d10..1ab094d2f4 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -8,7 +8,7 @@ function change_language(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(); } |