diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-30 21:00:06 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-30 21:00:06 +0200 |
| commit | be5638c11024a82c4b2bb2edd5356a01e1a6f726 (patch) | |
| tree | e7bc05221e4a81d93ecf50185a54a8512ecb1b47 | |
| parent | e64c1b463ee0188d4018bc6c66a3808d22b9fae1 (diff) | |
| parent | a0db23bd0e6e6bfa8bf5c2afc49ecd8a290b0d38 (diff) | |
| download | forums-be5638c11024a82c4b2bb2edd5356a01e1a6f726.tar forums-be5638c11024a82c4b2bb2edd5356a01e1a6f726.tar.gz forums-be5638c11024a82c4b2bb2edd5356a01e1a6f726.tar.bz2 forums-be5638c11024a82c4b2bb2edd5356a01e1a6f726.tar.xz forums-be5638c11024a82c4b2bb2edd5356a01e1a6f726.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13118] Correctly use the provided datetime class
| -rw-r--r-- | phpBB/phpbb/user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index ea98034434..882e9cef26 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -717,7 +717,7 @@ class user extends \phpbb\session $utc = new \DateTimeZone('UTC'); } - $time = new \phpbb\datetime($this, "@$gmepoch", $utc); + $time = new $this->datetime($this, "@$gmepoch", $utc); $time->setTimezone($this->timezone); return $time->format($format, $forcedate); |