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

Calendar - fix missing history in a way that doesn't fail every test

Browse Source
This commit is contained in:
nathangray 2018-11-21 13:50:29 -07:00
parent cbaf7e7062
commit e9910345dc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1371,18 +1371,18 @@ class calendar_boupdate extends calendar_bo
// you should always update modification time (ctag depends on it!)
if ($updateTS)
{
$event['modified'] = $this->now;
$event['modifier'] = $this->user;
$event['modified'] = $save_event['modified'] = $this->now;
$event['modifier'] = $save_event['modifier'] = $this->user;
}
if (empty($event['id']) && (!isset($event['created']) || $event['created'] > $this->now))
{
$event['created'] = $this->now;
$event['creator'] = $this->user;
$event['created'] = $save_event['created'] = $this->now;
$event['creator'] = $save_event['creator'] = $this->user;
}
$set_recurrences = $old_event ? abs($event['recur_enddate'] - $old_event['recur_enddate']) > 1 : false;
$set_recurrences_start = 0;
if (($cal_id = $this->so->save($save_event,$set_recurrences,$set_recurrences_start,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
if (($cal_id = $this->so->save($event,$set_recurrences,$set_recurrences_start,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
{
$save_event['id'] = $cal_id;
// unset participants to enforce the default stati for all added recurrences
@ -1407,7 +1407,7 @@ class calendar_boupdate extends calendar_bo
// Update history
$tracking = new calendar_tracking($this);
if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
$tracking->track($event, $old_event);
$tracking->track($save_event, $old_event);
return $cal_id;
}