Changeset 5732 in subversion

Timestamp:

Jan 6, 2012 5:43:05 AM (17 months ago)

Author:

alec

Message:

• Don't return 'unknown', use empty string, DateTime?* handle more exceptions

File:

• trunk/roundcubemail/program/include/main.inc (modified) (2 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -1067 +1067 @@
   }
   catch (Exception $e) {
-    return 'unknown';
+    return '';
   }
 
@@ -1887 +1887 @@
 
   // get user's timezone
-  $tz = new DateTimeZone($RCMAIL->config->get('timezone'));
-
-  $date = new DateTime('now', $tz);
+  try {
+    $tz   = new DateTimeZone($RCMAIL->config->get('timezone'));
+    $date = new DateTime('now', $tz);
+  }
+  catch (Exception $e) {
+    $date = new DateTime();
+  }
+
   return $date->format('r');
 }