Changeset 87986cf in github

Timestamp:

Jan 6, 2012 4:40:32 AM (17 months ago)

Author:

thomascube <thomas@…>

Branches:

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

Children:

529bd3f

Parents:

ac78df3

Message:

Handle DateTime? exceptions

File:

• program/include/main.inc (modified) (1 diff)

program/include/main.inc

@@ -1063 +1063 @@
     return '';
 
-  $date = new DateTime("@".$ts);
-
-  // convert to the right timezone
-  $stz = date_default_timezone_get();
-  $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezone') : 'GMT');
-  date_default_timezone_set($tz->getName());
-  $date->setTimezone($tz);
-
-  $timestamp = $date->format('U');
+  try {
+    $date = new DateTime("@".$ts);
+  }
+  catch (Exception $e) {
+    return 'unknown';
+  }
+
+  try {
+    // convert to the right timezone
+    $stz = date_default_timezone_get();
+    $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezones') : 'GMT');
+    $date->setTimezone($tz);
+    date_default_timezone_set($tz->getName());
+
+    $timestamp = $date->format('U');
+  }
+  catch (Exception $e) {
+    $timestamp = $ts;
+  }
 
   // define date format depending on current time