holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing r37108 calendar_timezone::DateTimeZone() returns a DateTimeZone not an egw_time object

Browse Source
This commit is contained in:
Ralf Becker 2011-11-07 17:11:59 +00:00
parent 05e07d0c80
commit 8cad47e22f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_ical.inc.php
View File

@ -2303,7 +2303,7 @@ class calendar_ical extends calendar_boupdate
$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 // 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 // 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(); $event['tzid'] = $tz->getName();
} }
@ -2311,7 +2311,7 @@ class calendar_ical extends calendar_boupdate
{ {
error_log(__METHOD__ . '() unknown TZID=' error_log(__METHOD__ . '() unknown TZID='
. $attributes['params']['TZID'] . ', defaulting to timezone "' . $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 $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=' error_log(__METHOD__ . '() unknown TZID='
. $attributes['params']['TZID'] . ', defaulting to timezone "' . $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 $event['tzid'] = date_default_timezone_get(); // default to current timezone
} }
} }