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

Prevent duplicate events in some tables

Browse Source
This commit is contained in:
Nathan Gray 2011-02-17 17:37:24 +00:00
parent 65baaf764e
commit d529f10479
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_merge.inc.php
View File

@ -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];
} }