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

* Calendar - fix recurring events were left out of merge from list

Browse Source
This commit is contained in:
nathangray 2018-10-25 10:08:46 -06:00
parent e8826ae69b
commit 4aef054ec9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -597,7 +597,8 @@ class calendar_uilist extends calendar_ui
$this->get_rows($query,$events,$readonlys); $this->get_rows($query,$events,$readonlys);
foreach($events as $key => $event) foreach($events as $key => $event)
{ {
if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$event['recur_date'], $checked)) unset($events[$key]); $recur_date = Api\DateTime::to($event['recur_date'],'ts');
if (!in_array($event['id'],$checked) && !in_array($event['id'].':'.$recur_date, $checked)) unset($events[$key]);
} }
$checked = array_values($events); // Clear keys $checked = array_values($events); // Clear keys
} }