Changeset a621a9d in github

Timestamp:

Mar 14, 2012 5:33:05 PM (15 months ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

b9ce92d

Parents:

6699a68

Message:

Accept DateTime? object as input to format_date()

File:

• program/include/main.inc (modified) (3 diffs)

program/include/main.inc

@@ -726 +726 @@
  * This uses the date formatting properties from config
  *
- * @param mixed  Date representation (string or timestamp)
+ * @param mixed  Date representation (string, timestamp or DateTime object)
  * @param string Date format to use
  * @param bool   Enables date convertion according to user timezone
@@ -736 +736 @@
   global $RCMAIL, $CONFIG;
 
-  if (!empty($date))
-    $ts = rcube_strtotime($date);
-
-  if (empty($ts))
-    return '';
-
-  try {
-    $date = new DateTime("@".$ts);
-  }
-  catch (Exception $e) {
-    return '';
+  if (is_a($date, 'DateTime')) {
+    $ts = $date->format('U');
+    $tzs = $date->getTimezone();
+  }
+  else {
+    $tzs = 'GMT';
+
+    if (!empty($date))
+      $ts = rcube_strtotime($date);
+
+    if (empty($ts))
+      return '';
+
+    try {
+      $date = new DateTime("@".$ts);
+    }
+    catch (Exception $e) {
+      return '';
+    }
   }
 
@@ -752 +760 @@
     // convert to the right timezone
     $stz = date_default_timezone_get();
-    $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezone') : 'GMT');
+    $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezone') : $tzs);
     $date->setTimezone($tz);
     date_default_timezone_set($tz->getName());