mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[feature/new-tz-handling] Rename $user->tz back to $user->timezone

Browse Source 
PHPBB3-9558
This commit is contained in:
Joas Schilling
2012-07-18 16:52:52 +02:00
parent 515e1662a9
commit a71e60cdbd
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -915,8 +915,8 @@ class acp_board
global $user, $config;
// Let the format_date function operate with the acp values
$old_tz = $user->tz;
$user->tz = new DateTimeZone($config['board_timezone']);
$old_tz = $user->timezone;
$user->timezone = new DateTimeZone($config['board_timezone']);
$dateformat_options = '';
@@ -935,7 +935,7 @@ class acp_board
$dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>';
// Reset users date options
$user->tz = $old_tz;
$user->timezone = $old_tz;
return "<select name=\"dateoptions\" id=\"dateoptions\" onchange=\"if (this.value == 'custom') { document.getElementById('" . addslashes($key) . "').value = '" . addslashes($value) . "'; } else { document.getElementById('" . addslashes($key) . "').value = this.value; }\">$dateformat_options</select>
<input type=\"text\" name=\"config[$key]\" id=\"$key\" value=\"$value\" maxlength=\"30\" />";