aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_register.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-07-17 16:09:05 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-07-17 16:09:05 +0200
commit3637cd395e39c1fa5b7279222abe1da5d2abcd00 (patch)
tree1e0d9f54950fb16f83dbcdde1001be5323778be1 /phpBB/includes/ucp/ucp_register.php
parent48d3c68290b96c7d2a0e875ec3338f067a529b22 (diff)
downloadforums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.tar
forums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.tar.gz
forums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.tar.bz2
forums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.tar.xz
forums-3637cd395e39c1fa5b7279222abe1da5d2abcd00.zip
[feature/new-tz-handling] Properly name new timezone selection function
Marked the old one as deprecated and made it using the new function. PHPBB3-9558
Diffstat (limited to 'phpBB/includes/ucp/ucp_register.php')
-rw-r--r--phpBB/includes/ucp/ucp_register.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 804bd2e0e2..705000d7a8 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -442,7 +442,7 @@ class ucp_register
break;
}
- $tz_select = tz_select($data['tz'], true, false);
+ $timezone_selects = phpbb_timezone_select($data['tz'], true, false);
$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'USERNAME' => $data['username'],
@@ -455,8 +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['tz_select'],
- 'S_TZ_DATE_OPTIONS' => $tz_select['tz_dates'],
+ 'S_TZ_OPTIONS' => $timezone_selects['tz_select'],
+ 'S_TZ_DATE_OPTIONS' => $timezone_selects['tz_dates'],
'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh']) ? true : false,
'S_REGISTRATION' => true,
'S_COPPA' => $coppa,