display booked room first if present for Course(Ex?)Date::getLocation(), fixes #4836

Closes #4836

Merge request studip/studip!3623

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/models/CourseDate.php b/lib/models/CourseDate.php
index 9a8d553..7f93ec0 100644
--- a/lib/models/CourseDate.php
+++ b/lib/models/CourseDate.php
@@ -226,10 +226,10 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
      */
     public function getRoomName()
     {
-        if (Config::get()->RESOURCES_ENABLE && !empty($this->room_booking->resource)) {
-            return $this->room_booking->resource->name;
+        if (Config::get()->RESOURCES_ENABLE && isset($this->room_booking->resource)) {
+            return $this->getRoom()->name;
         }
-        return $this['raum'];
+        return $this->raum ?? '';
     }
 
     /**
@@ -611,7 +611,7 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
 
     public function getLocation(): string
     {
-        return $this->raum ?? '';
+        return $this->getRoomName();
     }
 
     public function getUniqueId(): string