From 6cc46a3d39f8c9d8d36ac3d873af5c0981cd2f88 Mon Sep 17 00:00:00 2001
From: kasimi <mail@kasimi.net>
Date: Sun, 3 Dec 2017 19:02:40 +0100
Subject: [PATCH] [ticket/15431] Moved phpbb_timezone_select() before the event

PHPBB3-15431
---
 phpBB/includes/ucp/ucp_register.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index b2efedadb3..6e010a0852 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -527,6 +527,9 @@ class ucp_register
 			break;
 		}
 
+		// Assign template vars for timezone select
+		phpbb_timezone_select($template, $user, $data['tz'], true);
+
 		$template_vars = array(
 			'USERNAME'			=> $data['username'],
 			'PASSWORD'			=> $data['new_password'],
@@ -548,7 +551,6 @@ class ucp_register
 			'COOKIE_PATH'		=> $config['cookie_path'],
 		);
 
-		$tz = $data['tz'];
 		$tpl_name = 'ucp_register';
 
 		/**
@@ -559,7 +561,6 @@ class ucp_register
 		* @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	tz					The selected timezone
 		* @var	string	tpl_name			Template name
 		* @since 3.2.2-RC1
 		*/
@@ -568,14 +569,10 @@ 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, $tz, true);
-
 		$template_vars = array_merge($template_vars, array(
 			'ERROR'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 			'S_HIDDEN_FIELDS'	=> build_hidden_fields($s_hidden_fields),