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-08 10:55:45 +01:00
parent dba803fff5
commit a7796d8f27
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_so.inc.php
View File

@ -1663,6 +1663,10 @@ ORDER BY cal_user_type, cal_usre_id
// check if recurrence enddate was adjusted // check if recurrence enddate was adjusted
if(isset($event['recur_enddate'])) if(isset($event['recur_enddate']))
{ {
if (is_object($event['recur_enddate']))
{
$event['recur_enddate'] = Api\DateTime::user2server($event['recur_enddate'], 'ts');
}
// recurrences need to be truncated // recurrences need to be truncated
if((int)$event['recur_enddate'] > 0 && if((int)$event['recur_enddate'] > 0 &&
((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate']) ((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate'])