summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-03-31 19:32:07 +0200
committerAleksander Machniak <alec@alec.pl>2014-03-31 19:32:07 +0200
commit16c7644ccbbbebbec9e7821da08ca95a46a5bfb7 (patch)
treefc174885f738f8150a488546bbe02fd0646b7b68 /program
parent73076d7ea69df0e1dedf231aeb7f4602532a6ff3 (diff)
parent2b05c5e9ecef2c377065261c4327c3cbaed9fdd5 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
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 {