diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 19:07:24 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 19:07:24 +0200 |
| commit | f4761b5e0847a95944aaf9b00057eaa059995b81 (patch) | |
| tree | d177a1b4f5674f35df9ba6e84059043dcbb8eca2 /phpBB/includes/acp | |
| parent | 9c310f789ffad41af46b36128f197176dc1f12e3 (diff) | |
| download | forums-f4761b5e0847a95944aaf9b00057eaa059995b81.tar forums-f4761b5e0847a95944aaf9b00057eaa059995b81.tar.gz forums-f4761b5e0847a95944aaf9b00057eaa059995b81.tar.bz2 forums-f4761b5e0847a95944aaf9b00057eaa059995b81.tar.xz forums-f4761b5e0847a95944aaf9b00057eaa059995b81.zip | |
[ticket/12858] Directly return and use timezone selects
PHPBB3-12858
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 160a52a1bf..9c9e32b57c 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -907,9 +907,8 @@ class acp_board global $template, $user; $timezone_select = phpbb_timezone_select($template, $user, $value, true); - $timezone_select['tz_select']; - 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 c9239e534a..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($template, $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, |