From 37c4dacdf18ebd857021fe0d7d72b3cb037387ba Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 23 Aug 2024 11:45:47 +0000
Subject: [PATCH] prevent warnings, fixes #4521
Closes #4521
Merge request studip/studip!3317
---
lib/raumzeit/CycleData.class.php | 2 +-
lib/raumzeit/SingleDate.class.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/raumzeit/CycleData.class.php b/lib/raumzeit/CycleData.class.php
index 587e0bc7f5f..ec0be1c6312 100644
--- a/lib/raumzeit/CycleData.class.php
+++ b/lib/raumzeit/CycleData.class.php
@@ -315,7 +315,7 @@ class CycleData
unset($termin);
$termin = new SingleDate();
$termin->fillValuesFromArray($val);
- $termin->setExTermin($val['ex_termin']);
+ $termin->setExTermin(!empty($val['ex_termin']));
$this->termine[$val['termin_id']] = $termin;
}
return TRUE;
diff --git a/lib/raumzeit/SingleDate.class.php b/lib/raumzeit/SingleDate.class.php
index 59357158303..bc9915eb1c8 100644
--- a/lib/raumzeit/SingleDate.class.php
+++ b/lib/raumzeit/SingleDate.class.php
@@ -370,7 +370,7 @@ class SingleDate
if (!$name) {
$holy_type = holiday($this->date);
- $name = $holy_type['name'];
+ $name = $holy_type ? $holy_type['name'] : null;
}
if ($name) {
--
GitLab