diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index 2fdb84081a..1bb5cfe913 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -102,13 +102,6 @@ class calendar_ical extends calendar_boupdate */ var $calendarOwner = 0; - /** - * Original timezone - * - * @var string - */ - var $original_tz; - /** * user preference: Use this timezone for import from and export to device * @@ -157,7 +150,6 @@ class calendar_ical extends calendar_boupdate if ($this->log) $this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal"; $this->clientProperties = $_clientProperties; $this->vCalendar = new Horde_iCalendar; - $this->original_tz = date_default_timezone_get(); } @@ -1396,7 +1388,7 @@ class calendar_ical extends calendar_boupdate { if ($this->tzid) { - date_default_timezone_set($this->original_tz); + date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']); } return false; } @@ -1440,7 +1432,7 @@ class calendar_ical extends calendar_boupdate if ($this->tzid) { - date_default_timezone_set($this->original_tz); + date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']); } // decide what to return