mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-29 18:50:25 +02:00
Merge branch '3.1.x' into 3.2.x
* 3.1.x: [ticket/14536] Force unix time stamps to be integer
This commit is contained in:
commit
7e2c8f1885
@ -595,7 +595,7 @@ class user extends \phpbb\session
|
||||
$utc = new \DateTimeZone('UTC');
|
||||
}
|
||||
|
||||
$time = new $this->datetime($this, "@$gmepoch", $utc);
|
||||
$time = new $this->datetime($this, '@' . (int) $gmepoch, $utc);
|
||||
$time->setTimezone($this->timezone);
|
||||
|
||||
return $time->format($format, $forcedate);
|
||||
|
Loading…
x
Reference in New Issue
Block a user