From 2b05c5e9ecef2c377065261c4327c3cbaed9fdd5 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Mon, 31 Mar 2014 19:02:24 +0200 Subject: Render 'now' dates in short form, too --- program/include/rcmail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'program/include/rcmail.php') 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 { -- cgit v1.2.3