aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-06-12 19:52:33 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-06-18 15:09:36 +0200
commit435573a9cb82060ddae673aa1e1572bd78c7741d (patch)
tree188e91a5b481d3c69d8dfbdd967fa5eda565bb4a /phpBB
parenta6bace039ab18ce5138a7f6ffa6d74c543bd6222 (diff)
downloadforums-435573a9cb82060ddae673aa1e1572bd78c7741d.tar
forums-435573a9cb82060ddae673aa1e1572bd78c7741d.tar.gz
forums-435573a9cb82060ddae673aa1e1572bd78c7741d.tar.bz2
forums-435573a9cb82060ddae673aa1e1572bd78c7741d.tar.xz
forums-435573a9cb82060ddae673aa1e1572bd78c7741d.zip
[feature/new-tz-handling] Fix Timezone selection on registration page
PHPBB3-9558
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/ucp/ucp_register.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index ac002a26c2..804bd2e0e2 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -442,6 +442,7 @@ class ucp_register
break;
}
+ $tz_select = tz_select($data['tz'], true, false);
$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'USERNAME' => $data['username'],
@@ -454,7 +455,8 @@ class ucp_register
'L_PASSWORD_EXPLAIN' => $user->lang($config['pass_complex'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_pass_chars']), $user->lang('CHARACTERS', (int) $config['max_pass_chars'])),
'S_LANG_OPTIONS' => language_select($data['lang']),
- 'S_TZ_OPTIONS' => tz_select($data['tz'], true),
+ 'S_TZ_OPTIONS' => $tz_select['tz_select'],
+ 'S_TZ_DATE_OPTIONS' => $tz_select['tz_dates'],
'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false,
'S_REGISTRATION' => true,
'S_COPPA' => $coppa,