From 5f5c24c54caa23cfeb035a403489b1154192d28d Mon Sep 17 00:00:00 2001 From: Marc-Etienne VARGENAU Date: Tue, 20 Aug 2013 17:39:38 +0000 Subject: [PATCH] Ensure relative_date is nonnegative --- src/www/include/html.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/www/include/html.php b/src/www/include/html.php index 1f6035c7ff..d9f2040995 100644 --- a/src/www/include/html.php +++ b/src/www/include/html.php @@ -1014,25 +1014,25 @@ function html_clean_hash_string($hashstr) { return $hashstr; } -function relative_date ($date) { - $delta = time() - $date; - if ($delta<60) +function relative_date($date) { + $delta = max(time() - $date, 0); + if ($delta < 60) return sprintf(ngettext('%d second ago', '%d seconds ago', $delta), $delta); - $delta = round($delta/60); - if ($delta<60) + $delta = round($delta / 60); + if ($delta < 60) return sprintf(ngettext('%d minute ago', '%d minutes ago', $delta), $delta); - $delta = round($delta/60); - if ($delta<24) + $delta = round($delta / 60); + if ($delta < 24) return sprintf(ngettext('%d hour ago', '%d hours ago', $delta), $delta); - $delta = round($delta/24); - if ($delta<7) + $delta = round($delta / 24); + if ($delta < 7) return sprintf(ngettext('%d day ago', '%d days ago', $delta), $delta); - $delta = round($delta/7); - if ($delta<4) + $delta = round($delta / 7); + if ($delta < 4) return sprintf(ngettext('%d week ago', '%d weeks ago', $delta), $delta); return date(_('Y-m-d H:i'), $date); -- 2.30.2