diff options
| author | Matt Friedman <maf675@gmail.com> | 2014-04-07 13:58:47 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2014-04-07 13:58:47 -0700 |
| commit | af6cabc1067b29850c1b037e878df2781e5c3de7 (patch) | |
| tree | 82a63fc4a0f85a502fb83d1392670c1eced52c10 /phpBB | |
| parent | 8af9092cf677707d8c17554f833964d748be444b (diff) | |
| download | forums-af6cabc1067b29850c1b037e878df2781e5c3de7.tar forums-af6cabc1067b29850c1b037e878df2781e5c3de7.tar.gz forums-af6cabc1067b29850c1b037e878df2781e5c3de7.tar.bz2 forums-af6cabc1067b29850c1b037e878df2781e5c3de7.tar.xz forums-af6cabc1067b29850c1b037e878df2781e5c3de7.zip | |
[ticket/12254] Persist set_lang after reg only if changed from default
PHPBB3-12254
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 4 |
1 files 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']) |