mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-18 22:41:28 +02:00
Code Issues Releases Wiki Activity

[feature/new-tz-handling] Properly name new timezone selection function

Browse Source 
Marked the old one as deprecated and made it using the new function.

PHPBB3-9558
This commit is contained in:
Joas Schilling
2012-07-17 16:09:05 +02:00
parent 48d3c68290
commit 3637cd395e
5 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/acp/acp_users.php
View File

@@ -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'],
)
);