extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-09 23:11:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use ['egw_info']['server']['server_timezone'] to reset server timezone

Browse Source
This commit is contained in:
Jörg Lehrke 2009-12-03 08:28:45 +00:00
parent 104e2464d5
commit e7ec189ea4
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,13 +102,6 @@ class calendar_ical extends calendar_boupdate
*/ */
var $calendarOwner = 0; var $calendarOwner = 0;
/**
* Original timezone
*
* @var string
*/
var $original_tz;
/** /**
* user preference: Use this timezone for import from and export to device * 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"; if ($this->log) $this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal";
$this->clientProperties = $_clientProperties; $this->clientProperties = $_clientProperties;
$this->vCalendar = new Horde_iCalendar; $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) if ($this->tzid)
{ {
date_default_timezone_set($this->original_tz); date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
} }
return false; return false;
} }
@ -1440,7 +1432,7 @@ class calendar_ical extends calendar_boupdate
if ($this->tzid) if ($this->tzid)
{ {
date_default_timezone_set($this->original_tz); date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
} }
// decide what to return // decide what to return