mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:07 +01:00
Use ['egw_info']['server']['server_timezone'] to reset server timezone
This commit is contained in:
parent
104e2464d5
commit
e7ec189ea4
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user