From 87b280e94be4d4389ef660ab60d0484361599d35 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 14 Mar 2007 04:50:34 -0400
Subject: [PATCH] Correctly format dates in future
---
program/include/main.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index b19c7f4..68cc903 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1726,9 +1726,9 @@
$week_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']);
// 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)
$format = $CONFIG['date_long'] ? $CONFIG['date_long'] : 'd.m.Y H:i';
--
Gitblit v1.9.1