makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15431] Moved phpbb_timezone_select() before the event

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

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

@ -527,6 +527,9 @@ class ucp_register
break; break;
} }
// Assign template vars for timezone select
phpbb_timezone_select($template, $user, $data['tz'], true);
$template_vars = array( $template_vars = array(
'USERNAME' => $data['username'], 'USERNAME' => $data['username'],
'PASSWORD' => $data['new_password'], 'PASSWORD' => $data['new_password'],
@ -548,7 +551,6 @@ class ucp_register
'COOKIE_PATH' => $config['cookie_path'], 'COOKIE_PATH' => $config['cookie_path'],
); );
$tz = $data['tz'];
$tpl_name = 'ucp_register'; $tpl_name = 'ucp_register';
/** /**
@ -559,7 +561,6 @@ class ucp_register
* @var array data Array with user data, read only * @var array data Array with user data, read only
* @var array error Array with errors * @var array error Array with errors
* @var array s_hidden_fields Array with hidden 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
*/ */
@ -568,14 +569,10 @@ 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
phpbb_timezone_select($template, $user, $tz, true);
$template_vars = array_merge($template_vars, array( $template_vars = array_merge($template_vars, array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields),