Changeset 508 in subversion

Timestamp:

Mar 14, 2007 4:50:34 AM (6 years ago)

Author:

thomasb

Message:

Correctly format dates in future

File:

• trunk/roundcubemail/program/include/main.inc (modified) (1 diff)

trunk/roundcubemail/program/include/main.inc

@@ -1727 +1727 @@
 
   // define date format depending on current time  
-  if ($CONFIG['prettydate'] && !$format && $timestamp > $today_limit)
+  if ($CONFIG['prettydate'] && !$format && $timestamp > $today_limit && $timestamp < $now)
     return sprintf('%s %s', rcube_label('today'), date($CONFIG['date_today'] ? $CONFIG['date_today'] : 'H:i', $timestamp));
-  else if ($CONFIG['prettydate'] && !$format && $timestamp > $week_limit)
+  else if ($CONFIG['prettydate'] && !$format && $timestamp > $week_limit && $timestamp < $now)
     $format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i';
   else if (!$format)