diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-06 14:22:55 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-06 14:22:55 -0800 |
| commit | a88ec1b1af954a447a666d3ff66b1d1df0a645db (patch) | |
| tree | 7ccfe6a03923ad118910202e21a605e13127192c /library/Smarty/libs/plugins/shared.make_timestamp.php | |
| parent | 553b3a5c6c2ba6b93ad1193ec044ee92cf7690aa (diff) | |
| parent | a6cb25020bb5200cc3c00ecc941ddb751644fbcc (diff) | |
| download | volse-hubzilla-a88ec1b1af954a447a666d3ff66b1d1df0a645db.tar.gz volse-hubzilla-a88ec1b1af954a447a666d3ff66b1d1df0a645db.tar.bz2 volse-hubzilla-a88ec1b1af954a447a666d3ff66b1d1df0a645db.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'library/Smarty/libs/plugins/shared.make_timestamp.php')
| -rw-r--r-- | library/Smarty/libs/plugins/shared.make_timestamp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/Smarty/libs/plugins/shared.make_timestamp.php b/library/Smarty/libs/plugins/shared.make_timestamp.php index 7c94e5f59..f87d40c7e 100644 --- a/library/Smarty/libs/plugins/shared.make_timestamp.php +++ b/library/Smarty/libs/plugins/shared.make_timestamp.php @@ -21,8 +21,8 @@ function smarty_make_timestamp($string) if (empty($string)) { // use "now": return time(); - } elseif ($string instanceof DateTime) { - return $string->getTimestamp(); + } elseif ($string instanceof DateTime || (interface_exists('DateTimeInterface', false) && $string instanceof DateTimeInterface)) { + return (int) $string->format('U'); // PHP 5.2 BC } elseif (strlen($string) == 14 && ctype_digit($string)) { // it is mysql timestamp format of YYYYMMDDHHMMSS? return mktime(substr($string, 8, 2), substr($string, 10, 2), substr($string, 12, 2), |