diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-03-14 08:50:34 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-03-14 08:50:34 +0000 |
| commit | 6ee2a94427b74908363e1b3db7256fba93ea3ea4 (patch) | |
| tree | 636fb7d011e102cd951868a3649aaa59a1a1a915 /roundcubemail/program | |
| parent | e24d5f4685cf50a75a936949328eeefa05513829 (diff) | |
Correctly format dates in future
git-svn-id: https://svn.roundcube.net/trunk@508 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index b19c7f412..68cc9032c 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -1726,9 +1726,9 @@ function format_date($date, $format=NULL) $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'; |