fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect value of DateTime::formatTimestamp() if timestamp is not given

Browse source
This commit is contained in:
Kijin Sung 2016-05-23 23:43:04 +09:00
parent 9a7445b677
commit 3ee6eaa363
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/datetime.php
View file

@ -22,7 +22,7 @@ class DateTime
public static function formatTimestamp($format, $timestamp = null) public static function formatTimestamp($format, $timestamp = null)
{ {
$offset = Config::get('locale.internal_timezone') ?: date('Z', $timestamp); $offset = Config::get('locale.internal_timezone') ?: date('Z', $timestamp);
return gmdate($format, $timestamp + $offset); return gmdate($format, ($timestamp ?: time()) + $offset);
} }
/** /**