From c8ac5637a4396af2d597a3454646acfa39972a66 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Wed, 29 Nov 2023 15:43:08 +0100
Subject: [PATCH] Fix PHP8 warnings

---
 plugins/calendar/drivers/kolab/kolab_driver.php    | 2 +-
 plugins/libcalendaring/lib/libcalendaring_itip.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 7d4f180d..67f83a21 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -1230,7 +1230,7 @@ class kolab_driver extends calendar_driver
             // save properties to a recurrence exception instance
             if (!empty($old['_instance']) && isset($master['recurrence']['EXCEPTIONS'])) {
                 if ($this->update_recurrence_exceptions($master, $event, $old, $savemode)) {
-                    $success = $storage->update_event($master, $old['id']);
+                    $success = $storage->update_event($master, $old['id'] ?? null);
                     break;
                 }
             }
diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index d1508157..99290167 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -931,7 +931,7 @@ class libcalendaring_itip
         }
         if (!empty($event['recurrence_date'])) {
             $table->add('label', '');
-            $table->add('recurrence-id', $this->gettext($event['thisandfuture'] ? 'itipfutureoccurrence' : 'itipsingleoccurrence'));
+            $table->add('recurrence-id', $this->gettext(!empty($event['thisandfuture']) ? 'itipfutureoccurrence' : 'itipsingleoccurrence'));
         }
         else if (!empty($event['recurrence'])) {
             $table->add('label', $this->gettext('recurring'));