extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-12 17:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - Fix alarms set in different timezone from server moved when saving event

Browse Source
This commit is contained in:
nathangray 2017-12-06 13:47:54 -07:00
parent 594bd63181
commit 33110fc2cd
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1347,6 +1347,10 @@ class calendar_boupdate extends calendar_bo
} }
} }
} }
foreach($event['alarm'] as $id => &$alarm)
{
$alarm['time'] = $this->date2ts($alarm['time'],true); // user to server-time
}
} }
// you should always update modification time (ctag depends on it!) // you should always update modification time (ctag depends on it!)
@ -1616,7 +1620,7 @@ class calendar_boupdate extends calendar_bo
); );
// Reset cached event // Reset cached event
static::$cached_event = array(); static::$cached_event = array();
if (isset($status2msg[$status]) && !$skip_notification) if (isset($status2msg[$status]) && !$skip_notification)
{ {
if (!is_array($event)) $event = $this->read($cal_id); if (!is_array($event)) $event = $this->read($cal_id);