mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 16:03:47 +01:00
* 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:
parent
ac061f68f7
commit
0d0511b099
@ -2301,7 +2301,19 @@ class calendar_ical extends calendar_boupdate
|
||||
try
|
||||
{
|
||||
$tz = calendar_timezones::DateTimeZone($attributes['params']['TZID']);
|
||||
$event['tzid'] = $tz->getName();
|
||||
// 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();
|
||||
}
|
||||
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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user