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

[ticket/15431] Split up $template_vars

Browse source 
PHPBB3-15431
This commit is contained in:
kasimi 2017-12-03 18:47:17 +01:00
parent 9c93c180b0
commit 65c529e66d
No known key found for this signature in database
GPG key ID: 3163AB573241193A
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
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'])
@ -529,7 +528,6 @@ class ucp_register
} }
$template_vars = array( $template_vars = array(
'ERROR' => (sizeof($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'],
@ -544,13 +542,13 @@ 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'],
); );
$tz = $data['tz'];
$tpl_name = 'ucp_register'; $tpl_name = 'ucp_register';
/** /**
@ -558,9 +556,10 @@ class ucp_register
* *
* @event core.ucp_register_modify_template_data * @event core.ucp_register_modify_template_data
* @var array template_vars Array with template data * @var array template_vars Array with template data
* @var array data Array with user data * @var array data Array with user data, read only
* @var array error Array with errors * @var array error Array with errors
* @var string s_hidden_fields HTML with hidden form field elements * @var array s_hidden_fields Array with hidden field elements
* @var string tz The selected timezone
* @var string tpl_name Template name * @var string tpl_name Template name
* @since 3.2.2-RC1 * @since 3.2.2-RC1
*/ */
@ -569,12 +568,18 @@ class ucp_register
'data', 'data',
'error', 'error',
's_hidden_fields', 's_hidden_fields',
'tz',
'tpl_name', 'tpl_name',
); );
extract($phpbb_dispatcher->trigger_event('core.ucp_register_modify_template_data', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.ucp_register_modify_template_data', compact($vars)));
// 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, $tz, true);
$template_vars = array_merge($template_vars, array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields),
));
$template->assign_vars($template_vars); $template->assign_vars($template_vars);