regard the freetext room name in CourseDate::getFullName (format "long-include-room") and SeminarCycleDate::toString (format "long-start"), fixes #5256

Closes #5256

Merge request studip/studip!3941

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/models/CourseDate.php b/lib/models/CourseDate.php
index 82dd692..9a8d553 100644
--- a/lib/models/CourseDate.php
+++ b/lib/models/CourseDate.php
@@ -338,12 +338,15 @@ class CourseDate extends SimpleORMap implements PrivacyObject, Event
 
         if (in_array($format, ['include-room', 'long-include-room'])) {
             $room = $this->getRoom();
-            if($room) {
+            if ($room) {
                 $string = sprintf('%s <a href="%s" target="_blank">%s</a>',
                     $string,
                     $room->getActionURL('booking_plan'),
                     htmlReady($room->name)
                 );
+            } elseif ($this->raum) {
+                //Use the freetext room name:
+                $string .= ' ' . $this->raum;
             }
         }
         return $string;