From 41b0b8c5f92c77e406c8fc96c810749cf99b4409 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 6 Apr 2014 23:55:46 -0700 Subject: [PATCH 1/9] [ticket/12254] Better language switching on registration page PHPBB3-12254 --- phpBB/includes/ucp/ucp_register.php | 1 - phpBB/phpbb/user.php | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index ff51ca7b3c..f866e8ec26 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -65,7 +65,6 @@ class ucp_register } $user->lang_name = $user_lang = $use_lang; - $user->lang = array(); $user->data['user_lang'] = $user->lang_name; $user->add_lang(array('common', 'ucp')); } diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index b9b3896606..fceeb53946 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,7 +80,21 @@ class user extends \phpbb\session } else { - $user_lang_name = basename($config['default_lang']); + $change_lang = request_var('change_lang', ''); + if ($change_lang) + { + global $SID, $_EXTRA_URL; + + $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 .= '&change_lang=' . $user_lang_name; + $_EXTRA_URL[] = 'change_lang=' . $user_lang_name; + } + else + { + $user_lang_name = basename($config['default_lang']); + } $user_date_format = $config['default_dateformat']; $user_timezone = $config['board_timezone']; @@ -189,7 +203,7 @@ class user extends \phpbb\session $style_id = $style_request; $SID .= '&style=' . $style_id; - $_EXTRA_URL = array('style=' . $style_id); + $_EXTRA_URL[] = 'style=' . $style_id; } else { From a5940ede5bc8a7594b84fd4b489ada2110ecbdcc Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 7 Apr 2014 01:38:24 -0700 Subject: [PATCH 2/9] [ticket/12254] Stop using deprecated request_var in user class PHPBB3-12254 --- phpBB/phpbb/user.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index fceeb53946..d9ff75b997 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -69,7 +69,7 @@ class user extends \phpbb\session */ function setup($lang_set = false, $style_id = false) { - global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache; + global $db, $request, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache; global $phpbb_dispatcher; if ($this->data['user_id'] != ANONYMOUS) @@ -80,7 +80,7 @@ class user extends \phpbb\session } else { - $change_lang = request_var('change_lang', ''); + $change_lang = $request->variable('change_lang', ''); if ($change_lang) { global $SID, $_EXTRA_URL; @@ -196,7 +196,7 @@ class user extends \phpbb\session } unset($lang_set_ext); - $style_request = request_var('style', 0); + $style_request = $request->variable('style', 0); if ($style_request && (!$config['override_user_style'] || $auth->acl_get('a_styles')) && !defined('ADMIN_START')) { global $SID, $_EXTRA_URL; From daae87d65a20664af09a002f90483cc75e84d01f Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 7 Apr 2014 09:14:58 -0700 Subject: [PATCH 3/9] [ticket/12254] Use new set_lang var to avoid conflict with change_lang PHPBB3-12254 --- phpBB/includes/ucp/ucp_register.php | 6 +++--- phpBB/phpbb/user.php | 6 +++--- phpBB/styles/prosilver/template/ucp_agreement.html | 1 + phpBB/styles/prosilver/template/ucp_register.html | 1 + 4 files changed, 8 insertions(+), 6 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']) diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index d9ff75b997..36f72a69b9 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('change_lang', ''); + $change_lang = $request->variable('set_lang', ''); 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 .= '&change_lang=' . $user_lang_name; - $_EXTRA_URL[] = 'change_lang=' . $user_lang_name; + $SID .= '&set_lang=' . $user_lang_name; + $_EXTRA_URL[] = 'set_lang=' . $user_lang_name; } else { diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html index 6c96be864a..5fabd40f9d 100644 --- a/phpBB/styles/prosilver/template/ucp_agreement.html +++ b/phpBB/styles/prosilver/template/ucp_agreement.html @@ -11,6 +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'].submit(); } diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index fc469eff36..22314babff 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -8,6 +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'].submit.click(); } // ]]> From 8af9092cf677707d8c17554f833964d748be444b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 7 Apr 2014 09:21:28 -0700 Subject: [PATCH 4/9] [ticket/12254] Add set_lang var changes to subsilver2 files PHPBB3-12254 --- phpBB/styles/subsilver2/template/ucp_agreement.html | 1 + phpBB/styles/subsilver2/template/ucp_register.html | 1 + 2 files changed, 2 insertions(+) diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html index 054d25282f..f2e904a66e 100644 --- a/phpBB/styles/subsilver2/template/ucp_agreement.html +++ b/phpBB/styles/subsilver2/template/ucp_agreement.html @@ -11,6 +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'].submit(); } diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index 3392c557a2..4d429f1d10 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -8,6 +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'].submit.click(); } From af6cabc1067b29850c1b037e878df2781e5c3de7 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 7 Apr 2014 13:58:47 -0700 Subject: [PATCH 5/9] [ticket/12254] Persist set_lang after reg only if changed from default PHPBB3-12254 --- phpBB/includes/ucp/ucp_register.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index fe4eeec1ef..b7f60304e1 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, + 'set_lang' => ($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, + 'set_lang' => ($user_lang != $config['default_lang']) ? $user_lang : '', )); if ($config['coppa_enable']) From 60be5021900d0907ca65f83d11ae4f0b5ce090b0 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 11 Apr 2014 08:50:15 -0700 Subject: [PATCH 6/9] [ticket/12254] Use 'language' instead of 'set_lang' as the variable name PHPBB3-12254 --- phpBB/includes/ucp/ucp_register.php | 4 ++-- phpBB/phpbb/user.php | 6 +++--- phpBB/styles/prosilver/template/ucp_agreement.html | 2 +- phpBB/styles/prosilver/template/ucp_register.html | 2 +- phpBB/styles/subsilver2/template/ucp_agreement.html | 2 +- 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(); } From 42c60c6a9fcc7a4e6124257c3547eae0d34998ba Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 11 Apr 2014 21:11:32 -0700 Subject: [PATCH 7/9] [ticket/12254] No longer need to add change_lang to the URL params PHPBB3-12254 --- phpBB/includes/ucp/ucp_register.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index e45a8d4bf3..3296043dd6 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -98,7 +98,6 @@ class ucp_register if (!$agreed || ($coppa === false && $config['coppa_enable']) || ($coppa && !$config['coppa_enable'])) { - $add_lang = ($change_lang) ? '&change_lang=' . urlencode($change_lang) : ''; $add_coppa = ($coppa !== false) ? '&coppa=' . $coppa : ''; $s_hidden_fields = array_merge($s_hidden_fields, array( @@ -145,12 +144,12 @@ class ucp_register 'L_COPPA_NO' => sprintf($user->lang['UCP_COPPA_BEFORE'], $coppa_birthday), 'L_COPPA_YES' => sprintf($user->lang['UCP_COPPA_ON_AFTER'], $coppa_birthday), - 'U_COPPA_NO' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register&coppa=0' . $add_lang), - 'U_COPPA_YES' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register&coppa=1' . $add_lang), + 'U_COPPA_NO' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register&coppa=0'), + 'U_COPPA_YES' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register&coppa=1'), 'S_SHOW_COPPA' => true, 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), - 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang), + 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), )); } else @@ -162,7 +161,7 @@ class ucp_register 'S_SHOW_COPPA' => false, 'S_REGISTRATION' => true, 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), - 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang . $add_coppa), + 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_coppa), ) ); } From 78325736b1560c17713b5207c53fe0af582fab0b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 2 May 2014 12:08:35 -0700 Subject: [PATCH 8/9] [ticket/12254] Use a cookie instead of SID to store language selection PHPBB3-12254 --- phpBB/includes/ucp/ucp_register.php | 11 +++++++++-- phpBB/phpbb/user.php | 8 ++------ phpBB/styles/prosilver/template/ucp_agreement.html | 2 +- phpBB/styles/prosilver/template/ucp_register.html | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 3296043dd6..8660a06dcf 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -102,7 +102,6 @@ class ucp_register $s_hidden_fields = array_merge($s_hidden_fields, array( 'change_lang' => '', - 'language' => ($user_lang != $config['default_lang']) ? $user_lang : '', )); // If we change the language, we want to pass on some more possible parameter. @@ -150,6 +149,9 @@ class ucp_register 'S_SHOW_COPPA' => true, 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), + + 'COOKIE_NAME' => $config['cookie_name'], + 'COOKIE_PATH' => $config['cookie_path'], )); } else @@ -162,6 +164,9 @@ class ucp_register 'S_REGISTRATION' => true, 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_coppa), + + 'COOKIE_NAME' => $config['cookie_name'], + 'COOKIE_PATH' => $config['cookie_path'], ) ); } @@ -410,7 +415,6 @@ class ucp_register $s_hidden_fields = array_merge($s_hidden_fields, array( 'agreed' => 'true', 'change_lang' => 0, - 'language' => ($user_lang != $config['default_lang']) ? $user_lang : '', )); if ($config['coppa_enable']) @@ -467,6 +471,9 @@ class ucp_register 'S_COPPA' => $coppa, 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), + + 'COOKIE_NAME' => $config['cookie_name'], + 'COOKIE_PATH' => $config['cookie_path'], )); // diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 628ddd8e59..c2dcc9db7a 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,16 +80,12 @@ class user extends \phpbb\session } else { - $change_lang = $request->variable('language', ''); + $change_lang = $request->variable($config['cookie_name'] . '_lang', '', true, \phpbb\request\request_interface::COOKIE); if ($change_lang) { - global $SID, $_EXTRA_URL; - $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 .= '&language=' . $user_lang_name; - $_EXTRA_URL[] = 'language=' . $user_lang_name; } else { @@ -203,7 +199,7 @@ class user extends \phpbb\session $style_id = $style_request; $SID .= '&style=' . $style_id; - $_EXTRA_URL[] = 'style=' . $style_id; + $_EXTRA_URL = array('style=' . $style_id); } else { diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html index 458f098b32..73db520a8e 100644 --- a/phpBB/styles/prosilver/template/ucp_agreement.html +++ b/phpBB/styles/prosilver/template/ucp_agreement.html @@ -10,8 +10,8 @@ */ function change_language(lang_iso) { + document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}'; document.forms['register'].change_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 0fe550a865..b27003faab 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -7,8 +7,8 @@ */ function change_language(lang_iso) { + document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}'; document.forms['register'].change_lang.value = lang_iso; - document.forms['register'].language.value = lang_iso; document.forms['register'].submit.click(); } // ]]> From 5b0b0d7c66ecd6f5d77726b635c3d6625caf56d7 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 2 May 2014 12:10:59 -0700 Subject: [PATCH 9/9] [ticket/12254] Add subsilver2 support for cookie storage instead of SID PHPBB3-12254 --- phpBB/styles/subsilver2/template/ucp_agreement.html | 2 +- phpBB/styles/subsilver2/template/ucp_register.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html index 74c3d02dc7..3afe6e89a0 100644 --- a/phpBB/styles/subsilver2/template/ucp_agreement.html +++ b/phpBB/styles/subsilver2/template/ucp_agreement.html @@ -10,8 +10,8 @@ */ function change_language(lang_iso) { + document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}'; document.forms['register'].change_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 1ab094d2f4..1d55b952e5 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -7,8 +7,8 @@ */ function change_language(lang_iso) { + document.cookie = '{COOKIE_NAME}_lang=' + lang_iso + '; path={COOKIE_PATH}'; document.forms['register'].change_lang.value = lang_iso; - document.forms['register'].language.value = lang_iso; document.forms['register'].submit.click(); }