From 8c8b2a487ad8bade7c7ec4b4fb32b63237b6e0d3 Mon Sep 17 00:00:00 2001 From: svncommit Date: Wed, 20 Dec 2006 15:59:50 +0000 Subject: Allow 12 hour date to display for emails sent today (Doug Mandell). --- program/include/main.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program/include/main.inc') diff --git a/program/include/main.inc b/program/include/main.inc index c6370eae9..c57aa8a9f 100644 --- a/program/include/main.inc +++ b/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) -- cgit v1.2.3