aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.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/acp/acp_users.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/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 949109abaf..a228e07c22 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1639,7 +1639,7 @@ class acp_users
${'s_sort_' . $sort_option . '_dir'} .= '</select>';
}
- $tz_select = tz_select($data['tz'], true, false);
+ $timezone_selects = phpbb_timezone_select($data['tz'], true, false);
$template->assign_vars(array(
'S_PREFS' => true,
'S_JABBER_DISABLED' => ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true,
@@ -1679,8 +1679,8 @@ class acp_users
'S_LANG_OPTIONS' => language_select($data['lang']),
'S_STYLE_OPTIONS' => style_select($data['style']),
- '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'],
)
);