summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2014-03-31 19:02:24 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-03-31 19:02:24 +0200
commit2b05c5e9ecef2c377065261c4327c3cbaed9fdd5 (patch)
tree064ab8b2d7c85aaf19d4c10e06ec72b7640f23e9 /program
parent57e5d735e213b9e868f6996626f373688d647a57 (diff)
Render 'now' dates in short form, too
Diffstat (limited to 'program')
-rw-r--r--program/include/rcmail.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 4aa3dedad..0fe5dbcf3 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1162,11 +1162,11 @@ class rcmail extends rcube
$week_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']);
$pretty_date = $this->config->get('prettydate');
- if ($pretty_date && $timestamp > $today_limit && $timestamp < $now) {
+ if ($pretty_date && $timestamp > $today_limit && $timestamp <= $now) {
$format = $this->config->get('date_today', $this->config->get('time_format', 'H:i'));
$today = true;
}
- else if ($pretty_date && $timestamp > $week_limit && $timestamp < $now) {
+ else if ($pretty_date && $timestamp > $week_limit && $timestamp <= $now) {
$format = $this->config->get('date_short', 'D H:i');
}
else {