fixes #3702

Closes #3702

Merge request studip/studip!2573

app/controllers/search/module.php

@@ -112,8 +112,13 @@ class Search_ModuleController extends MVVController
                 $modul = Modul::find($mod_id);
                 $start_sem = Semester::find($modul->start);
                 $end_sem = Semester::find($modul->end);
-                if ($start_sem->beginn > $this->selected_semester->beginn
-                        || ($this->selected_semester->ende > $end_sem->ende && $end_sem != null)) {
+                if (
+                    $start_sem->beginn > $this->selected_semester->beginn
+                    || (
+                        isset($end_sem)
+                        && $this->selected_semester->ende > $end_sem->ende
+                    )
+                ) {
                     unset($this->search_result['Modul'][$i]);
                 }
             }

app/views/search/module/_modul.php

-<tbody class="<?= $modul_id == $modul->id ? 'not-collapsed' : 'collapsed' ?>">
+<?php
+/**
+ * @var string|null $modul_id
+ * @var Modul $modul
+ * @var Semester $selected_semester
+ * @var Search_ModuleController $controller
+ */
+?>
+<tbody class="<?= (isset($modul_id) && $modul_id == $modul->id) ? 'not-collapsed' : 'collapsed' ?>">
     <tr class="table-header header-row" id="modul_<?= htmlReady($modul->id) ?>">
         <td style="vertical-align: middle; text-align: center;">
             <a data-dialog="size=auto" title="<?= htmlReady($modul->getDisplayName()) . ' (' . _('Vollständige Modulbeschreibung') . ')' ?>" href="<?= $controller->link_for('shared/modul/description/' . $modul->id) ?>">
@@ -25,7 +33,7 @@
         <? endif; ?>
         </td>
     </tr>
-<? if ($details_id == $modul->id): ?>
+<? if (isset($details_id) && $details_id == $modul->id): ?>
     <?= $this->render_partial('search/module/details') ?>
 <? endif; ?>
 </tbody>

lib/classes/I18NStringDatafield.php

@@ -91,7 +91,7 @@ class I18NStringDatafield extends I18NString
                 "`datafield_id` = ? AND `range_id` = ? AND `sec_range_id` = ? AND `lang` = ''",
                 $object_id
             );
-            $base = $df->content;
+            $base = $df->content ?? '';
         }
         $table = null;
         $field = null;

lib/models/Modul.php

@@ -1034,7 +1034,7 @@ class Modul extends ModuleManagementModelTreeItem
         foreach ($this->modulteile as $modulteil) {
             $mt_courses = $modulteil->getAssignedCoursesBySemester($semester_id, $only_visible);
             foreach ($mt_courses as $course) {
-                $courses[$course->id] = $course;
+                $courses[$course['seminar_id']] = $course;
             }
         }
         return $courses;

lib/models/Modulteil.php

@@ -394,7 +394,7 @@ class Modulteil extends ModuleManagementModelTreeItem
         foreach ($this->lvgruppen as $lvgruppe) {
             $lvg_courses = $lvgruppe->getAssignedCoursesBySemester($semester_id, $only_visible);
             foreach ($lvg_courses as $course) {
-                $courses[$course->id] = $course;
+                $courses[$course['seminar_id']] = $course;
             }
         }
         return $courses;