diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-14 20:40:04 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-14 20:40:04 +0100 |
| commit | e0e410e8a29bc9b2ff64518f02dde9eaafb21285 (patch) | |
| tree | 9ca22966956e18ff876585b624f834160fa43afd | |
| parent | 79a6648b99bc570dd9705547a35e21df808a6657 (diff) | |
| parent | 0641c209d73d56cbbb00e7f8bc4b64c8a0c9f902 (diff) | |
| download | forums-e0e410e8a29bc9b2ff64518f02dde9eaafb21285.tar forums-e0e410e8a29bc9b2ff64518f02dde9eaafb21285.tar.gz forums-e0e410e8a29bc9b2ff64518f02dde9eaafb21285.tar.bz2 forums-e0e410e8a29bc9b2ff64518f02dde9eaafb21285.tar.xz forums-e0e410e8a29bc9b2ff64518f02dde9eaafb21285.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 97d2631224..694aaf1351 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -45,6 +45,11 @@ class ucp_register $change_lang = $request->variable('change_lang', ''); $user_lang = $request->variable('lang', $user->lang_name); + if ($agreed && !check_form_key('ucp_register')) + { + $agreed = false; + } + /** * Add UCP register data before they are assigned to the template or submitted * @@ -67,14 +72,7 @@ class ucp_register ); extract($phpbb_dispatcher->trigger_event('core.ucp_register_requests_after', compact($vars))); - if ($agreed) - { - add_form_key('ucp_register'); - } - else - { - add_form_key('ucp_register_terms'); - } + add_form_key('ucp_register'); if ($change_lang || $user_lang != $config['default_lang']) { |