makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Derky 2017-12-03 23:06:09 +01:00
commit f70801856a
1 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
phpBB/includes/ucp/ucp_register.php
View file

@ -505,7 +505,6 @@ class ucp_register
{ {
$s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields()); $s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields());
} }
$s_hidden_fields = build_hidden_fields($s_hidden_fields);
// Visual Confirmation - Show images // Visual Confirmation - Show images
if ($config['enable_confirm']) if ($config['enable_confirm'])
@ -531,8 +530,7 @@ class ucp_register
// Assign template vars for timezone select // Assign template vars for timezone select
phpbb_timezone_select($template, $user, $data['tz'], true); phpbb_timezone_select($template, $user, $data['tz'], true);
$template->assign_vars(array( $template_vars = array(
'ERROR' => (count($error)) ? implode('<br />', $error) : '',
'USERNAME' => $data['username'], 'USERNAME' => $data['username'],
'PASSWORD' => $data['new_password'], 'PASSWORD' => $data['new_password'],
'PASSWORD_CONFIRM' => $data['password_confirm'], 'PASSWORD_CONFIRM' => $data['password_confirm'],
@ -547,13 +545,41 @@ class ucp_register
'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false, 'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false,
'S_REGISTRATION' => true, 'S_REGISTRATION' => true,
'S_COPPA' => $coppa, 'S_COPPA' => $coppa,
'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
'COOKIE_NAME' => $config['cookie_name'], 'COOKIE_NAME' => $config['cookie_name'],
'COOKIE_PATH' => $config['cookie_path'], 'COOKIE_PATH' => $config['cookie_path'],
);
$tpl_name = 'ucp_register';
/**
* Modify template data on the registration page
*
* @event core.ucp_register_modify_template_data
* @var array template_vars Array with template data
* @var array data Array with user data, read only
* @var array error Array with errors
* @var array s_hidden_fields Array with hidden field elements
* @var string tpl_name Template name
* @since 3.2.2-RC1
*/
$vars = array(
'template_vars',
'data',
'error',
's_hidden_fields',
'tpl_name',
);
extract($phpbb_dispatcher->trigger_event('core.ucp_register_modify_template_data', compact($vars)));
$template_vars = array_merge($template_vars, array(
'ERROR' => (count($error)) ? implode('<br />', $error) : '',
'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields),
)); ));
$template->assign_vars($template_vars);
// //
$user->profile_fields = array(); $user->profile_fields = array();
@ -561,8 +587,7 @@ class ucp_register
$cp->generate_profile_fields('register', $user->get_iso_lang_id()); $cp->generate_profile_fields('register', $user->get_iso_lang_id());
// //
$this->tpl_name = 'ucp_register'; $this->tpl_name = $tpl_name;
$this->page_title = 'UCP_REGISTRATION';
} }
/** /**