diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-24 17:53:57 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-24 17:53:57 +0100 |
| commit | 7e2c8f188524762f3af122fa1d9a622e250accc3 (patch) | |
| tree | b169b494d1bbfa07231ffd588f9a3d9836b8b8f8 /phpBB | |
| parent | 51c243f76bdd98ecce2592d56284820a9bbf541e (diff) | |
| parent | dcb6154be7e7f8afcecb17c89dce8841d56dd0af (diff) | |
| download | forums-7e2c8f188524762f3af122fa1d9a622e250accc3.tar forums-7e2c8f188524762f3af122fa1d9a622e250accc3.tar.gz forums-7e2c8f188524762f3af122fa1d9a622e250accc3.tar.bz2 forums-7e2c8f188524762f3af122fa1d9a622e250accc3.tar.xz forums-7e2c8f188524762f3af122fa1d9a622e250accc3.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14536] Force unix time stamps to be integer
Diffstat (limited to 'phpBB')
| -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 5262e10e87..305510851c 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -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); |