extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:42:30 +02:00
Code Issues 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 e60d061183
commit 78ddd31b71
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

@ -600,7 +600,8 @@ class calendar_uilist extends calendar_ui
$this->get_rows($query,$events,$readonlys);
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
}