diff options
-rwxr-xr-x | classes/feeds.php | 2 | ||||
-rw-r--r-- | classes/timehelper.php | 8 | ||||
-rw-r--r-- | include/functions.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 20aa9c05d..529a8e403 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -299,7 +299,7 @@ class Feeds extends Handler_Protected { $this->_mark_timestamp(" enclosures"); $line["updated_long"] = TimeHelper::make_local_datetime($line["updated"],true); - $line["updated"] = TimeHelper::make_local_datetime($line["updated"], false, false, false, true); + $line["updated"] = TimeHelper::make_local_datetime($line["updated"], false, null, false, true); $line['imported'] = T_sprintf("Imported at %s", TimeHelper::make_local_datetime($line["date_entered"], false)); diff --git a/classes/timehelper.php b/classes/timehelper.php index 4317f343f..e66f82f90 100644 --- a/classes/timehelper.php +++ b/classes/timehelper.php @@ -1,7 +1,7 @@ <?php class TimeHelper { - static function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) { + static function smart_date_time(int $timestamp, int $tz_offset = 0, int $owner_uid = null, bool $eta_min = false): string { if (!$owner_uid) $owner_uid = $_SESSION['uid']; if ($eta_min && time() + $tz_offset - $timestamp < 3600) { @@ -21,8 +21,8 @@ class TimeHelper { } } - static function make_local_datetime($timestamp, $long, $owner_uid = false, - $no_smart_dt = false, $eta_min = false) { + static function make_local_datetime(string $timestamp, bool $long, int $owner_uid = null, + bool $no_smart_dt = false, bool $eta_min = false): string { if (!$owner_uid) $owner_uid = $_SESSION['uid']; if (!$timestamp) $timestamp = '1970-01-01 0:00'; @@ -67,7 +67,7 @@ class TimeHelper { } } - static function convert_timestamp($timestamp, $source_tz, $dest_tz) { + static function convert_timestamp(int $timestamp, string $source_tz, string $dest_tz): int { try { $source_tz = new DateTimeZone($source_tz); diff --git a/include/functions.php b/include/functions.php index 238cbe7f5..8b112e3fb 100644 --- a/include/functions.php +++ b/include/functions.php @@ -213,12 +213,12 @@ } /** function is @deprecated by TimeHelper::smart_date_time() */ - function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) { + function smart_date_time(int $timestamp, int $tz_offset = 0, int $owner_uid = null, bool $eta_min = false): string { return TimeHelper::smart_date_time($timestamp, $tz_offset, $owner_uid, $eta_min); } /** function is @deprecated by TimeHelper::make_local_datetime() */ - function make_local_datetime($timestamp, $long, $owner_uid = false, $no_smart_dt = false, $eta_min = false) { + function make_local_datetime(string $timestamp, bool $long, int $owner_uid = null, bool $no_smart_dt = false, bool $eta_min = false): string { return TimeHelper::make_local_datetime($timestamp, $long, $owner_uid, $no_smart_dt, $eta_min); } |