From 97aa917c6d7f16fbf57edd69cdbbe55263d3f99b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 18 Jul 2015 00:01:37 +0300 Subject: [PATCH] smart_date_time: better eta_min handling --- include/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/functions.php b/include/functions.php index e5f2ca48..c2745522 100644 --- a/include/functions.php +++ b/include/functions.php @@ -960,7 +960,7 @@ function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) { if (!$owner_uid) $owner_uid = $_SESSION['uid']; - if ($eta_min && date("Y.m.d.G", $timestamp) == date("Y.m.d.G", time() + $tz_offset)) { + if ($eta_min && time() + $tz_offset - $timestamp < 3600) { return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp)); } else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) { return date("G:i", $timestamp); -- 2.39.2