holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* iMip/Mail/Calendar: fix event-doublication on accepting, if the event was deleted once

Browse Source 
caused by the deleted event was returned first and then ignored by calendar_ui::meeting
This commit is contained in:
Ralf Becker 2019-04-25 16:21:45 +02:00
parent 56f80fe670
commit 9bd4ccde4c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/inc/class.calendar_so.inc.php
View File

@ -366,6 +366,9 @@ class calendar_so
} }
$cols .= ',range_end-1 AS recur_enddate'; $cols .= ',range_end-1 AS recur_enddate';
// sort deleted to the end, to prefer non-deleted events over deleted ones when querying by uid
$group_by .= ' ORDER BY cal_deleted IS NOT NULL,egw_cal.cal_id DESC';
$events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date); $events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
// if we wanted to read the real recurrence, but we have eg. only a virtual one, we need to try again without $read_recurrence // if we wanted to read the real recurrence, but we have eg. only a virtual one, we need to try again without $read_recurrence