mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-27 00:58:55 +01:00
Prevent duplicate events in some tables
This commit is contained in:
parent
65baaf764e
commit
d529f10479
@ -210,6 +210,7 @@ class calendar_merge extends bo_merge
|
|||||||
'order' => 'cal_start',
|
'order' => 'cal_start',
|
||||||
'daywise' => true
|
'daywise' => true
|
||||||
));
|
));
|
||||||
|
$days = array();
|
||||||
$replacements = array();
|
$replacements = array();
|
||||||
foreach($events as $day => $list)
|
foreach($events as $day => $list)
|
||||||
{
|
{
|
||||||
@ -269,6 +270,7 @@ class calendar_merge extends bo_merge
|
|||||||
));
|
));
|
||||||
|
|
||||||
$replacements = array();
|
$replacements = array();
|
||||||
|
$days = array();
|
||||||
foreach($events as $day => $list)
|
foreach($events as $day => $list)
|
||||||
{
|
{
|
||||||
foreach($list as $key => $event)
|
foreach($list as $key => $event)
|
||||||
@ -276,7 +278,6 @@ class calendar_merge extends bo_merge
|
|||||||
$days[date('Ymd',$_date)][$plugin][] = $this->calendar_replacements($event);
|
$days[date('Ymd',$_date)][$plugin][] = $this->calendar_replacements($event);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//_debug_array($days);
|
|
||||||
return $days[date('Ymd',$_date)][$plugin][0];
|
return $days[date('Ymd',$_date)][$plugin][0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user