From 529bd3f1c49be04c5eba851db2621b5b94940a89 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 06 Jan 2012 05:43:05 -0500
Subject: [PATCH] - Don't return 'unknown', use empty string, DateTime* handle more exceptions
---
program/include/main.inc | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index b073662..f6e2ca2 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1066,7 +1066,7 @@
$date = new DateTime("@".$ts);
}
catch (Exception $e) {
- return 'unknown';
+ return '';
}
try {
@@ -1886,9 +1886,14 @@
global $RCMAIL;
// get user's timezone
- $tz = new DateTimeZone($RCMAIL->config->get('timezone'));
+ try {
+ $tz = new DateTimeZone($RCMAIL->config->get('timezone'));
+ $date = new DateTime('now', $tz);
+ }
+ catch (Exception $e) {
+ $date = new DateTime();
+ }
- $date = new DateTime('now', $tz);
return $date->format('r');
}
--
Gitblit v1.9.1