[Fusionforge-commits] r17749 - trunk/src/www/include

Marc-Etienne VARGENAU vargenau at fusionforge.org
Tue Aug 20 19:39:38 CEST 2013


Author: vargenau
Date: 2013-08-20 19:39:38 +0200 (Tue, 20 Aug 2013)
New Revision: 17749

Modified:
   trunk/src/www/include/html.php
Log:
Ensure relative_date is nonnegative

Modified: trunk/src/www/include/html.php
===================================================================
--- trunk/src/www/include/html.php	2013-08-20 17:38:13 UTC (rev 17748)
+++ trunk/src/www/include/html.php	2013-08-20 17:39:38 UTC (rev 17749)
@@ -1014,25 +1014,25 @@
 	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);




More information about the Fusionforge-commits mailing list