From e86a21bd83a0ae6cadfe9c919582951f306d3b64 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 06 Jan 2012 05:55:07 -0500
Subject: [PATCH] - Fix typo in timezone handling, more exception catching
---
program/include/main.inc | 2 +-
program/include/rcube_config.php | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index f6e2ca2..148c2bd 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1072,7 +1072,7 @@
try {
// convert to the right timezone
$stz = date_default_timezone_get();
- $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezones') : 'GMT');
+ $tz = new DateTimeZone($convert ? $RCMAIL->config->get('timezone') : 'GMT');
$date->setTimezone($tz);
date_default_timezone_set($tz->getName());
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index e163957..0383364 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -254,9 +254,13 @@
*/
public function get_timezone()
{
- if ($this->get('timezone')) {
- $tz = new DateTimeZone($this->get('timezone'));
- return $tz->getOffset(new DateTime('now')) / 3600;
+ if ($tz = $this->get('timezone')) {
+ try {
+ $tz = new DateTimeZone($tz);
+ return $tz->getOffset(new DateTime('now')) / 3600;
+ }
+ catch (Exception $e) {
+ }
}
return 0;
--
Gitblit v1.9.1