extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix user / server timezone mismatch could trigger an incorrect status reset

Browse Source
This commit is contained in:
nathangray 2020-06-25 09:38:34 -06:00
parent 5b1071e3d9
commit 34dbf8531b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3021,7 +3021,9 @@ class calendar_boupdate extends calendar_bo
*/ */
protected function check_reset_statuses(&$event, $old_event) protected function check_reset_statuses(&$event, $old_event)
{ {
if(!$old_event || !is_array($old_event) || $event['start'] == $old_event['start']) // Event passed is still in user time at this point, convert to servertime for
// comparison, but don't modify it in event
if(!$old_event || !is_array($old_event) || $this->date2ts($event['start'],true) == $old_event['start'])
{ {
return false; return false;
} }