diff options
| author | robin <robin@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-12-20 15:59:50 +0000 |
|---|---|---|
| committer | robin <robin@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-12-20 15:59:50 +0000 |
| commit | b932fa51009b3b1c4621781866dade93231c98df (patch) | |
| tree | fed266a8684b2916c22d0331866f30b1d8bedb40 /roundcubemail/program/include/main.inc | |
| parent | 038ecf30db68e45c232a95a60c2ea47678962ad7 (diff) | |
Allow 12 hour date to display for emails sent today (Doug Mandell).
git-svn-id: https://svn.roundcube.net/trunk@423 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/main.inc')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index c6370eae9..c57aa8a9f 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -1710,7 +1710,7 @@ function format_date($date, $format=NULL) // define date format depending on current time if ($CONFIG['prettydate'] && !$format && $timestamp > $today_limit) - return sprintf('%s %s', rcube_label('today'), date('H:i', $timestamp)); + 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) $format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i'; else if (!$format) |