mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-02 14:57:37 +02:00
Merge pull request #1597 from marc1706/ticket/11723
[ticket/11723] Correctly redirect user to agreement page and let him leave
This commit is contained in:
@@ -38,7 +38,7 @@ class ucp_register
|
|||||||
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
|
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
|
||||||
|
|
||||||
$coppa = $request->is_set('coppa') ? (int) $request->variable('coppa', false) : false;
|
$coppa = $request->is_set('coppa') ? (int) $request->variable('coppa', false) : false;
|
||||||
$agreed = (int) $request->variable('agreed', false);
|
$agreed = $request->variable('agreed', false);
|
||||||
$submit = $request->is_set_post('submit');
|
$submit = $request->is_set_post('submit');
|
||||||
$change_lang = request_var('change_lang', '');
|
$change_lang = request_var('change_lang', '');
|
||||||
$user_lang = request_var('lang', $user->lang_name);
|
$user_lang = request_var('lang', $user->lang_name);
|
||||||
@@ -63,7 +63,7 @@ class ucp_register
|
|||||||
$submit = false;
|
$submit = false;
|
||||||
|
|
||||||
// Setting back agreed to let the user view the agreement in his/her language
|
// Setting back agreed to let the user view the agreement in his/her language
|
||||||
$agreed = ($request->variable('change_lang', false)) ? 0 : $agreed;
|
$agreed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$user->lang_name = $user_lang = $use_lang;
|
$user->lang_name = $user_lang = $use_lang;
|
||||||
@@ -89,7 +89,7 @@ class ucp_register
|
|||||||
$add_coppa = ($coppa !== false) ? '&coppa=' . $coppa : '';
|
$add_coppa = ($coppa !== false) ? '&coppa=' . $coppa : '';
|
||||||
|
|
||||||
$s_hidden_fields = array(
|
$s_hidden_fields = array(
|
||||||
'change_lang' => $change_lang,
|
'change_lang' => '',
|
||||||
);
|
);
|
||||||
|
|
||||||
// If we change the language, we want to pass on some more possible parameter.
|
// If we change the language, we want to pass on some more possible parameter.
|
||||||
|
Reference in New Issue
Block a user