second batch of changes, re #2193

Merge request studip/studip!1421

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php
index 51df109..3cb6c12 100644
--- a/lib/models/resources/ResourceRequest.class.php
+++ b/lib/models/resources/ResourceRequest.class.php
@@ -849,11 +849,21 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
         }
 
         if ($this->metadate_id) {
+            $date = $this->cycle->dates->last();
+            if (!isset($date)) {
+                return null;
+            }
+
             $end_date->setTimestamp($this->cycle->dates->last()->end_time);
             return $end_date;
         }
 
         if ($this->course_id) {
+            $date = $this->course->dates->last();
+            if (!isset($date)) {
+                return null;
+            }
+
             $end_date->setTimestamp($this->course->dates->last()->end_time);
             return $end_date;
         }