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/user.php | |
| 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/user.php')
| -rw-r--r-- | phpBB/includes/user.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php index c3bdc71774..48c328214d 100644 --- a/phpBB/includes/user.php +++ b/phpBB/includes/user.php @@ -33,7 +33,7 @@ class phpbb_user extends phpbb_session /** * DateTimeZone object holding the timezone of the user */ - public $tz; + public $timezone; var $lang_name = false; var $lang_id = false; @@ -127,7 +127,7 @@ class phpbb_user extends phpbb_session */ } - $this->tz = new DateTimeZone($user_timezone); + $this->timezone = new DateTimeZone($user_timezone); // We include common language file here to not load it every time a custom language file is included $lang = &$this->lang; @@ -623,7 +623,7 @@ class phpbb_user extends phpbb_session } $time = new phpbb_datetime($this, "@$gmepoch", $utc); - $time->setTimezone($this->tz); + $time->setTimezone($this->timezone); return $time->format($format, $forcedate); } @@ -638,7 +638,7 @@ class phpbb_user extends phpbb_session */ public function create_datetime($time = 'now', DateTimeZone $timezone = null) { - $timezone = $timezone ?: $this->tz; + $timezone = $timezone ?: $this->timezone; return new phpbb_datetime($this, $time, $timezone); } @@ -652,7 +652,7 @@ class phpbb_user extends phpbb_session */ public function get_timestamp_from_format($format, $time, DateTimeZone $timezone = null) { - $timezone = $timezone ?: $this->tz; + $timezone = $timezone ?: $this->timezone; $date = DateTime::createFromFormat($format, $time, $timezone); return ($date !== false) ? $date->format('U') : false; } |