From 38b103430bf838061ef78c804e225c36a74ee217 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Wed, 29 Sep 2021 18:56:56 +0200
Subject: [PATCH] Fix PHP8 warnings

---
 plugins/calendar/calendar.php             | 4 ++--
 plugins/libcalendaring/lib/Horde_Date.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index dbd876d6..475f1bfa 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -2391,7 +2391,7 @@ $("#rcmfd_new_category").keypress(function(event) {
             }
 
             // set new organizer identity
-            if ($organizer !== false && $identity) {
+            if ($organizer !== false && !empty($identity)) {
                 $event['attendees'][$organizer]['name']  = $identity['name'];
                 $event['attendees'][$organizer]['email'] = $identity['email'];
             }
@@ -2401,7 +2401,7 @@ $("#rcmfd_new_category").keypress(function(event) {
                 unset($event['attendees'][$owner]['rsvp']);
             }
             // fallback to the selected identity
-            else if ($organizer === false && $identity) {
+            else if ($organizer === false && !empty($identity)) {
                 $event['attendees'][] = [
                     'role'  => 'ORGANIZER',
                     'name'  => $identity['name'],
diff --git a/plugins/libcalendaring/lib/Horde_Date.php b/plugins/libcalendaring/lib/Horde_Date.php
index 5265acd5..faa71ffa 100644
--- a/plugins/libcalendaring/lib/Horde_Date.php
+++ b/plugins/libcalendaring/lib/Horde_Date.php
@@ -292,7 +292,7 @@ class Horde_Date
      */
     public function toDateTime()
     {
-        $date = new DateTime(null, new DateTimeZone($this->_timezone));
+        $date = new DateTime('now', new DateTimeZone($this->_timezone));
         $date->setDate($this->_year, $this->_month, $this->_mday);
         $date->setTime($this->_hour, $this->_min, $this->_sec);
         return $date;