mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-27 00:09:13 +01:00
bugfix: recur event left double, if the first event gets changed
This commit is contained in:
parent
91e2dde838
commit
62f71d3296
@ -1730,7 +1730,6 @@
|
|||||||
|
|
||||||
for($i=0;$i<count($this->cached_events[$date]);$i++)
|
for($i=0;$i<count($this->cached_events[$date]);$i++)
|
||||||
{
|
{
|
||||||
$events = $this->cached_events[$date][$i];
|
|
||||||
if($this->cached_events[$date][$i]['id'] == $event['id'] || $this->cached_events[$date][$i]['reference'] == $event['id'])
|
if($this->cached_events[$date][$i]['id'] == $event['id'] || $this->cached_events[$date][$i]['reference'] == $event['id'])
|
||||||
{
|
{
|
||||||
if($this->debug)
|
if($this->debug)
|
||||||
@ -2035,6 +2034,10 @@
|
|||||||
for($i=0;$i<$c_cached_ids;$i++)
|
for($i=0;$i<$c_cached_ids;$i++)
|
||||||
{
|
{
|
||||||
$event = $this->so->read_entry($cached_event_ids[$i]);
|
$event = $this->so->read_entry($cached_event_ids[$i]);
|
||||||
|
if ($event['recur_type'])
|
||||||
|
{
|
||||||
|
continue; // fetch recuring events only in 2. loop
|
||||||
|
}
|
||||||
$startdate = intval(date('Ymd',$this->maketime($event['start'])));
|
$startdate = intval(date('Ymd',$this->maketime($event['start'])));
|
||||||
$enddate = intval(date('Ymd',$this->maketime($event['end'])));
|
$enddate = intval(date('Ymd',$this->maketime($event['end'])));
|
||||||
$this->cached_events[$startdate][] = $event;
|
$this->cached_events[$startdate][] = $event;
|
||||||
|
Loading…
Reference in New Issue
Block a user