diff options
| author | mrjive <mrjive@mrjive.it> | 2016-01-03 09:52:37 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2016-01-03 09:52:37 +0100 |
| commit | 07f5bdde60f55e3b217aee9e33c3175e90a5f0f1 (patch) | |
| tree | 2b5988c7661c9a5a67f5da8797ca57381e2aad7a /library/Smarty/libs/plugins/shared.make_timestamp.php | |
| parent | 051346325609f5f2e78ef0deaf182c65d7823bbc (diff) | |
| parent | 5b0a17359d6b5b3e27219c9e56117f1017996175 (diff) | |
| download | volse-hubzilla-07f5bdde60f55e3b217aee9e33c3175e90a5f0f1.tar.gz volse-hubzilla-07f5bdde60f55e3b217aee9e33c3175e90a5f0f1.tar.bz2 volse-hubzilla-07f5bdde60f55e3b217aee9e33c3175e90a5f0f1.zip | |
Merge pull request #10 from redmatrix/master
updating from original codebase
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), |