extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: Fix user / server timezone mismatch could put incorrect changes in event history

Browse Source
This commit is contained in:
nathangray 2020-06-24 13:36:11 -06:00
parent 143be4dc98
commit d4fb758a94
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1380,7 +1380,7 @@ class calendar_boupdate extends calendar_bo
foreach($timestamps as $ts) foreach($timestamps as $ts)
{ {
// we convert here from user-time to timestamps in server-time! // we convert here from user-time to timestamps in server-time!
if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0; if (isset($event[$ts])) $save_event[$ts] = $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
} }
// convert tzid name to integer tz_id, of set user default // convert tzid name to integer tz_id, of set user default
if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid']))) if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid'])))