From 65c529e66dbd4199900a2bb91a7b7ada8ccc47f0 Mon Sep 17 00:00:00 2001
From: kasimi <mail@kasimi.net>
Date: Sun, 3 Dec 2017 18:47:17 +0100
Subject: [PATCH] [ticket/15431] Split up $template_vars
PHPBB3-15431
---
phpBB/includes/ucp/ucp_register.php | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index f424a4e95e..b2efedadb3 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -505,7 +505,6 @@ class ucp_register
{
$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
if ($config['enable_confirm'])
@@ -529,7 +528,6 @@ class ucp_register
}
$template_vars = array(
- 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'USERNAME' => $data['username'],
'PASSWORD' => $data['new_password'],
'PASSWORD_CONFIRM' => $data['password_confirm'],
@@ -544,13 +542,13 @@ class ucp_register
'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false,
'S_REGISTRATION' => true,
'S_COPPA' => $coppa,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
'COOKIE_NAME' => $config['cookie_name'],
'COOKIE_PATH' => $config['cookie_path'],
);
+ $tz = $data['tz'];
$tpl_name = 'ucp_register';
/**
@@ -558,9 +556,10 @@ class ucp_register
*
* @event core.ucp_register_modify_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 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
* @since 3.2.2-RC1
*/
@@ -569,12 +568,18 @@ class ucp_register
'data',
'error',
's_hidden_fields',
+ 'tz',
'tpl_name',
);
extract($phpbb_dispatcher->trigger_event('core.ucp_register_modify_template_data', compact($vars)));
// 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);