From 8cad47e22f6b17509ee35282d2e89700c3e68cf6 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 7 Nov 2011 17:11:59 +0000 Subject: [PATCH] fixing r37108 calendar_timezone::DateTimeZone() returns a DateTimeZone not an egw_time object --- calendar/inc/class.calendar_ical.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index 53e214645b..f450ef2e2c 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -2303,7 +2303,7 @@ class calendar_ical extends calendar_boupdate $tz = calendar_timezones::DateTimeZone($attributes['params']['TZID']); // sometimes we do not get an egw_time object but no exception is thrown // may be php 5.2.x related. occurs when a NokiaE72 tries to open Outlook invitations - if ($tz instanceof egw_time) + if ($tz instanceof DateTimeZone) { $event['tzid'] = $tz->getName(); } @@ -2311,7 +2311,7 @@ class calendar_ical extends calendar_boupdate { error_log(__METHOD__ . '() unknown TZID=' . $attributes['params']['TZID'] . ', defaulting to timezone "' - . date_default_timezone_get() . '".'); + . date_default_timezone_get() . '".'.array2string($tz)); $event['tzid'] = date_default_timezone_get(); // default to current timezone } } @@ -2319,7 +2319,7 @@ class calendar_ical extends calendar_boupdate { error_log(__METHOD__ . '() unknown TZID=' . $attributes['params']['TZID'] . ', defaulting to timezone "' - . date_default_timezone_get() . '".'); + . date_default_timezone_get() . '".'.$e->getMessage()); $event['tzid'] = date_default_timezone_get(); // default to current timezone } }