From 9860d9e4cf85317f096261fdd379512180a1574f Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Tue, 10 Feb 2026 08:02:33 +0100 Subject: prevent php8 warning, fixes #6237 Closes #6237 Merge request studip/studip!4717 --- lib/models/resources/ResourceRequest.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/models/resources/ResourceRequest.php b/lib/models/resources/ResourceRequest.php index 12a1e41..0fe0342 100644 --- a/lib/models/resources/ResourceRequest.php +++ b/lib/models/resources/ResourceRequest.php @@ -863,7 +863,10 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen public function getEndDate() { $end_date = new DateTime(); - if (count($this->appointments) > 0) { + if ( + count($this->appointments) > 0 + && isset($this->appointments->last()->appointment->end_time) + ) { $end_date->setTimestamp($this->appointments->last()->appointment->end_time); return $end_date; } @@ -879,7 +882,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen return null; } - $end_date->setTimestamp($this->cycle->dates->last()->end_time); + $end_date->setTimestamp($date->end_time); return $end_date; } @@ -889,7 +892,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen return null; } - $end_date->setTimestamp($this->course->dates->last()->end_time); + $end_date->setTimestamp($date->end_time); return $end_date; } -- cgit v1.0