diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 13:47:59 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 13:47:59 +0200 |
| commit | 85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9 (patch) | |
| tree | f6058aff04281232666162f15b5d3054b349240c /phpBB/includes/acp | |
| parent | f3fef8934ee1614bc158c05699e57f0ba8a3fcb6 (diff) | |
| parent | 457e13634e3b371fbb5fbf1116c761311a683957 (diff) | |
| download | forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar.gz forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar.bz2 forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.tar.xz forums-85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9.zip | |
Merge pull request #2844 from marc1706/ticket/12858
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index f2707f15ca..9c9e32b57c 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -904,12 +904,11 @@ class acp_board */ function timezone_select($value, $key) { - global $user; + global $template, $user; - $timezone_select = phpbb_timezone_select($user, $value, true); - $timezone_select['tz_select']; + $timezone_select = phpbb_timezone_select($template, $user, $value, true); - return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select['tz_select'] . '</select>'; + return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select . '</select>'; } /** diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 40d8218a07..31b033604d 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1661,7 +1661,7 @@ class acp_users ${'s_sort_' . $sort_option . '_dir'} .= '</select>'; } - $timezone_selects = phpbb_timezone_select($user, $data['tz'], true); + phpbb_timezone_select($template, $user, $data['tz'], true); $user_prefs_data = array( 'S_PREFS' => true, 'S_JABBER_DISABLED' => ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true, @@ -1700,8 +1700,6 @@ class acp_users 'S_LANG_OPTIONS' => language_select($data['lang']), 'S_STYLE_OPTIONS' => style_select($data['style']), - 'S_TZ_OPTIONS' => $timezone_selects['tz_select'], - 'S_TZ_DATE_OPTIONS' => $timezone_selects['tz_dates'], ); /** |