mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-21 00:51:27 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/13118] Correctly use the provided datetime class
This commit is contained in:
Andreas Fischer
2014-09-30 21:00:06 +02:00
parent e64c1b463e a0db23bd0e
commit be5638c110
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/user.php
View File

@@ -717,7 +717,7 @@ class user extends \phpbb\session
$utc = new \DateTimeZone('UTC'); $utc = new \DateTimeZone('UTC');
} }
$time = new \phpbb\datetime($this, "@$gmepoch", $utc); $time = new $this->datetime($this, "@$gmepoch", $utc);
$time->setTimezone($this->timezone); $time->setTimezone($this->timezone);
return $time->format($format, $forcedate); return $time->format($format, $forcedate);