* calendar/esync: handle error regarding not getting 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

This commit is contained in:
Klaus Leithoff 2011-11-03 14:22:54 +00:00
parent 9e2e0e878c
commit c7664f5850

View File

@ -2306,8 +2306,20 @@ class calendar_ical extends calendar_boupdate
try try
{ {
$tz = calendar_timezones::DateTimeZone($attributes['params']['TZID']); $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)
{
$event['tzid'] = $tz->getName(); $event['tzid'] = $tz->getName();
} }
else
{
error_log(__METHOD__ . '() unknown TZID='
. $attributes['params']['TZID'] . ', defaulting to timezone "'
. date_default_timezone_get() . '".');
$event['tzid'] = date_default_timezone_get(); // default to current timezone
}
}
catch(Exception $e) catch(Exception $e)
{ {
error_log(__METHOD__ . '() unknown TZID=' error_log(__METHOD__ . '() unknown TZID='