diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-06-12 19:54:26 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-06-18 15:09:45 +0200 |
| commit | 5f96e5d374d1702d3d81591b7c69ede1cafebfa7 (patch) | |
| tree | d586a266b45f50e4c20941749e623672f8fb941a /phpBB/includes | |
| parent | 435573a9cb82060ddae673aa1e1572bd78c7741d (diff) | |
| download | forums-5f96e5d374d1702d3d81591b7c69ede1cafebfa7.tar forums-5f96e5d374d1702d3d81591b7c69ede1cafebfa7.tar.gz forums-5f96e5d374d1702d3d81591b7c69ede1cafebfa7.tar.bz2 forums-5f96e5d374d1702d3d81591b7c69ede1cafebfa7.tar.xz forums-5f96e5d374d1702d3d81591b7c69ede1cafebfa7.zip | |
[feature/new-tz-handling] Fix timezone option when editing a user in the ACP
PHPBB3-9558
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index b863a9ed80..949109abaf 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1639,6 +1639,7 @@ class acp_users ${'s_sort_' . $sort_option . '_dir'} .= '</select>'; } + $tz_select = tz_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, @@ -1678,7 +1679,8 @@ class acp_users 'S_LANG_OPTIONS' => language_select($data['lang']), 'S_STYLE_OPTIONS' => style_select($data['style']), - 'S_TZ_OPTIONS' => tz_select($data['tz'], true), + 'S_TZ_OPTIONS' => $tz_select['tz_select'], + 'S_TZ_DATE_OPTIONS' => $tz_select['tz_dates'], ) ); |