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/datetime.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/datetime.php')
| -rw-r--r-- | phpBB/includes/datetime.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/datetime.php b/phpBB/includes/datetime.php index 0d80c77115..b3462ddf67 100644 --- a/phpBB/includes/datetime.php +++ b/phpBB/includes/datetime.php @@ -38,7 +38,7 @@ class phpbb_datetime extends DateTime public function __construct($user, $time = 'now', DateTimeZone $timezone = null) { $this->user = $user; - $timezone = $timezone ?: $this->user->tz; + $timezone = $timezone ?: $this->user->timezone; parent::__construct($time, $timezone); } @@ -55,7 +55,7 @@ class phpbb_datetime extends DateTime $format = $format ? $format : $this->user->date_format; $format = self::format_cache($format, $this->user); $relative = ($format['is_short'] && !$force_absolute); - $now = new self($this->user, 'now', $this->user->tz); + $now = new self($this->user, 'now', $this->user->timezone); $timestamp = $this->getTimestamp(); $now_ts = $now->getTimeStamp(); |