diff options
| author | Wave <wave72@users.noreply.github.com> | 2015-12-20 10:20:36 +0100 |
|---|---|---|
| committer | Wave <wave72@users.noreply.github.com> | 2015-12-20 10:20:36 +0100 |
| commit | 2aad4c2cf9c17a7532089aadfcc5feff6505ec74 (patch) | |
| tree | 2082c8dc7ba090f610874b6e33b0f1092a2ff00c /library/Smarty/libs/plugins/shared.make_timestamp.php | |
| parent | 474a1267d73c1dcf00678dd15ed4e0e37496473d (diff) | |
| parent | e2692a4baaf031bd0d9c0893c3762637b1f6b201 (diff) | |
| download | volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.tar.gz volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.tar.bz2 volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.zip | |
Merge pull request #4 from redmatrix/master
Merge master into dev branch
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), |