diff options
| author | wn_ <invalid@email.com> | 2024-12-15 17:47:27 +0000 |
|---|---|---|
| committer | wn_ <invalid@email.com> | 2024-12-15 17:47:27 +0000 |
| commit | 119c7f13dcb9b91368304e3affd0219108ec490f (patch) | |
| tree | c0efebffe51f142948859895d2bc0d6ac80ef165 /classes | |
| parent | d5b1258d294fb8b0e43344a9925a9202925fcb02 (diff) | |
Consistently handle the 'smart' display of default/never dates.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Counters.php | 4 | ||||
| -rw-r--r-- | classes/Feeds.php | 3 | ||||
| -rw-r--r-- | classes/TimeHelper.php | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/classes/Counters.php b/classes/Counters.php index 99d4fdab1..535c8b32b 100644 --- a/classes/Counters.php +++ b/classes/Counters.php @@ -191,10 +191,6 @@ class Counters { $ts = 0; } - // hide default un-updated timestamp i.e. 1970-01-01 (?) -fox - if ((int)date('Y') - (int)date('Y', strtotime($line['last_updated'] ?? '')) > 2) - $last_updated = ''; - $cv = [ "id" => $id, "updated" => $last_updated, diff --git a/classes/Feeds.php b/classes/Feeds.php index 39380cc01..5c0999e2b 100644 --- a/classes/Feeds.php +++ b/classes/Feeds.php @@ -152,8 +152,7 @@ class Feeds extends Handler_Protected { $feed_title = $qfh_ret[1]; $feed_site_url = $qfh_ret[2]; $last_error = $qfh_ret[3]; - $last_updated = str_contains($qfh_ret[4] ?? "", '1970-') ? - __("Never") : TimeHelper::make_local_datetime($qfh_ret[4], false); + $last_updated = TimeHelper::make_local_datetime($qfh_ret[4], false); $highlight_words = $qfh_ret[5]; $reply['first_id'] = $qfh_ret[6]; $reply['is_vfeed'] = $qfh_ret[7]; diff --git a/classes/TimeHelper.php b/classes/TimeHelper.php index 07df3b87c..5b140e913 100644 --- a/classes/TimeHelper.php +++ b/classes/TimeHelper.php @@ -2,6 +2,10 @@ class TimeHelper { static function smart_date_time(int $timestamp, int $tz_offset = 0, ?int $owner_uid = null, bool $eta_min = false): string { + // i.e. if the Unix epoch + if ($timestamp - $tz_offset === 0) + return __('Never'); + if (!$owner_uid) $owner_uid = $_SESSION['uid']; $profile = isset($_SESSION['uid']) && $owner_uid == $_SESSION['uid'] && isset($_SESSION['profile']) ? $_SESSION['profile'] : null; |