Merge branch '3.2.x'

* 3.2.x:
  [ticket/14536] Force unix time stamps to be integer
This commit is contained in:
Tristan Darricau 2016-03-24 17:54:14 +01:00
commit b0d105c8e0

View file

@ -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);