diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-07-16 18:29:31 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-07-16 18:29:31 +0200 |
| commit | f5bb145040a483a76fd734bb9d4025c54e7917a0 (patch) | |
| tree | 41aeef9b548c7e2efaf69e3f40d112a1ab02f5e1 /phpBB/includes/user.php | |
| parent | 82e195ac683f6604aee9862233ffcb4f58af64b0 (diff) | |
| download | forums-f5bb145040a483a76fd734bb9d4025c54e7917a0.tar forums-f5bb145040a483a76fd734bb9d4025c54e7917a0.tar.gz forums-f5bb145040a483a76fd734bb9d4025c54e7917a0.tar.bz2 forums-f5bb145040a483a76fd734bb9d4025c54e7917a0.tar.xz forums-f5bb145040a483a76fd734bb9d4025c54e7917a0.zip | |
[feature/new-tz-handling] Require user argument on phpbb_datetime
PHPBB3-9558
Diffstat (limited to 'phpBB/includes/user.php')
| -rw-r--r-- | phpBB/includes/user.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php index df8f048c89..cc50d2b98e 100644 --- a/phpBB/includes/user.php +++ b/phpBB/includes/user.php @@ -631,7 +631,7 @@ class phpbb_user extends phpbb_session $utc = new DateTimeZone('UTC'); } - $time = new phpbb_datetime("@$gmepoch", $utc, $this); + $time = new phpbb_datetime($this, "@$gmepoch", $utc); $time->setTimezone($this->tz); return $time->format($format, $forcedate); @@ -648,7 +648,7 @@ class phpbb_user extends phpbb_session public function create_datetime($time = 'now', DateTimeZone $timezone = null) { $timezone = $timezone ?: $this->tz; - return new phpbb_datetime($time, $timezone, $this); + return new phpbb_datetime($this, $time, $timezone); } /** |