aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Hendrik Willms <tleilax+studip@gmail.com>2026-02-10 08:02:33 +0100
committerJan-Hendrik Willms <tleilax+studip@gmail.com>2026-02-10 09:13:43 +0100
commit17eb912462745e9c8ddd5db996f2d450a2002ff6 (patch)
treea69d14e8fa7bc3d9324636ee29a58348d62039d8
parent061f003fc64749baa06752f53241aef20ebd1929 (diff)
prevent php8 warning, fixes #6237
Closes #6237 Merge request studip/studip!4717
-rw-r--r--lib/models/resources/ResourceRequest.class.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php
index 277378a..5263011 100644
--- a/lib/models/resources/ResourceRequest.class.php
+++ b/lib/models/resources/ResourceRequest.class.php
@@ -858,7 +858,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;
}
@@ -874,7 +877,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;
}
@@ -884,7 +887,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;
}