From 1cc9e210f5cb340599062ae9cee15cdc9ebd77a7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 12 Sep 2011 19:56:12 +0000
Subject: Make date/time format user configurable; drop 'date_today' config
 option

---
 program/include/main.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'program/include')

diff --git a/program/include/main.inc b/program/include/main.inc
index 909d0a5f2..452505f07 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1055,13 +1055,13 @@ function format_date($date, $format=NULL)
   // define date format depending on current time
   if (!$format) {
     if ($CONFIG['prettydate'] && $timestamp > $today_limit && $timestamp < $now) {
-      $format = $CONFIG['date_today'] ? $CONFIG['date_today'] : 'H:i';
+      $format = $RCMAIL->config->get('date_today', $RCMAIL->config->get('time_format', 'H:i'));
       $today  = true;
     }
     else if ($CONFIG['prettydate'] && $timestamp > $week_limit && $timestamp < $now)
-      $format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i';
+      $format = $RCMAIL->config->get('date_short', 'D H:i');
     else
-      $format = $CONFIG['date_long'] ? $CONFIG['date_long'] : 'd.m.Y H:i';
+      $format = $RCMAIL->config->get('date_long', 'Y-m-d H:i');
   }
 
   // strftime() format
-- 
cgit v1.2.3