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

fix PHP 8.0 TypeError: Unsupported operand types: EGroupware\Api\DateTime - int

Browse Source
This commit is contained in:
Ralf Becker 2021-11-05 13:52:20 +01:00
parent 466b84d446
commit e73923f0c5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1543,7 +1543,7 @@ class calendar_boupdate extends calendar_bo
$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 = $old_event ? abs(Api\DateTime::to($event['recur_enddate'], 'utc') - Api\DateTime::to($old_event['recur_enddate'], 'utc')) > 1 : false;
$set_recurrences_start = 0;
if (($cal_id = $this->so->save($event,$set_recurrences,$set_recurrences_start,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
{
@ -1938,7 +1938,8 @@ class calendar_boupdate extends calendar_bo
if (!($exception = $this->read($id))) continue;
$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
$exception['reference'] = $exception['recurrence'] = 0;
$this->update($exception, true, true, false, true, $msg=null, true);
$msg = null;
$this->update($exception, true, true, false, true, $msg, true);
++$exceptions_kept;
}
}