From af6cabc1067b29850c1b037e878df2781e5c3de7 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 7 Apr 2014 13:58:47 -0700 Subject: [PATCH] [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'])