diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 14:15:16 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 14:22:08 +0200 |
| commit | 9ebee7de323eae3ac86f025f44429d2d4bc995b1 (patch) | |
| tree | 93bdbdd2e0c86391fc9c27182af409fca833370d /phpBB/includes/acp | |
| parent | 20903c0a9b0bc2df65feca467a2e318e700a9b8a (diff) | |
| download | forums-9ebee7de323eae3ac86f025f44429d2d4bc995b1.tar forums-9ebee7de323eae3ac86f025f44429d2d4bc995b1.tar.gz forums-9ebee7de323eae3ac86f025f44429d2d4bc995b1.tar.bz2 forums-9ebee7de323eae3ac86f025f44429d2d4bc995b1.tar.xz forums-9ebee7de323eae3ac86f025f44429d2d4bc995b1.zip | |
[ticket/12858] Generate timezone selects with template loop
PHPBB3-12858
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, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index f2707f15ca..160a52a1bf 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -904,9 +904,9 @@ class acp_board */ function timezone_select($value, $key) { - global $user; + global $template, $user; - $timezone_select = phpbb_timezone_select($user, $value, true); + $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>'; diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 40d8218a07..1874bca7fc 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); + $timezone_selects = 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, |