Thomas Bruederli
2014-03-31 2b05c5e9ecef2c377065261c4327c3cbaed9fdd5
Render 'now' dates in short form, too
1 files modified
4 ■■■■ changed files
program/include/rcmail.php 4 ●●●● patch | view | raw | blame | history
program/include/rcmail.php
@@ -1162,11 +1162,11 @@
            $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 {