diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-07-18 16:52:52 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-07-18 16:52:52 +0200 |
| commit | a71e60cdbd3e47c62a565dd777a28aec6832fb88 (patch) | |
| tree | 5917a09f5a91dcbc2eb2cb80cb7e487c287e477d /phpBB/includes/acp | |
| parent | 515e1662a900526342b595692d73372f4fb7bbf9 (diff) | |
| download | forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.tar forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.tar.gz forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.tar.bz2 forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.tar.xz forums-a71e60cdbd3e47c62a565dd777a28aec6832fb88.zip | |
[feature/new-tz-handling] Rename $user->tz back to $user->timezone
PHPBB3-9558
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 47a08b0bab..4af9d52e44 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -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\" />"; |