mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 13:44:12 +02:00
Code Issues Releases Wiki Activity

[feature/new-tz-handling] Don't use global user but make it a parameter

Browse Source 
PHPBB3-9558
This commit is contained in:
Joas Schilling
2012-07-19 17:41:27 +02:00
parent 5b7884907c
commit 7df1c84447
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_board.php
View File

@@ -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>';

2
phpBB/includes/acp/acp_users.php
View File

@@ -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,