diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-07-19 17:41:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-07-19 17:41:27 +0200 |
| commit | 7df1c84447903ecc97a8418339ec6933bdfc9035 (patch) | |
| tree | 49a4ca4338b2ff5a8bbda518eac236c1af87e043 /phpBB/includes/acp | |
| parent | 5b7884907c7b6e24689f826f90fc5f10cb968118 (diff) | |
| download | forums-7df1c84447903ecc97a8418339ec6933bdfc9035.tar forums-7df1c84447903ecc97a8418339ec6933bdfc9035.tar.gz forums-7df1c84447903ecc97a8418339ec6933bdfc9035.tar.bz2 forums-7df1c84447903ecc97a8418339ec6933bdfc9035.tar.xz forums-7df1c84447903ecc97a8418339ec6933bdfc9035.zip | |
[feature/new-tz-handling] Don't use global user but make it a parameter
PHPBB3-9558
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 937d9e926f..575d05933f 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -901,7 +901,9 @@ class acp_board */ function timezone_select($value, $key) { - $timezone_select = phpbb_timezone_select($value, true); + global $user; + + $timezone_select = phpbb_timezone_select($user, $value, true); $timezone_select['tz_select']; return '<select name="config[' . $key . ']" id="' . $key . '">' . $timezone_select['tz_select'] . '</select>'; diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index a228e07c22..3f05f216d9 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>'; } - $timezone_selects = phpbb_timezone_select($data['tz'], true, false); + $timezone_selects = phpbb_timezone_select($user, $data['tz'], true); $template->assign_vars(array( 'S_PREFS' => true, 'S_JABBER_DISABLED' => ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true, |