From 10b73231bf67b7f414b4dfb146a3453e0cc841b7 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Tue, 20 Feb 2024 08:44:49 +0000
Subject: [PATCH] let MyRealmModel::getPreparedCourses() always return an
array, fixes #3756
Closes #3756
Merge request studip/studip!2630
---
app/controllers/my_courses.php | 2 +-
lib/classes/MyRealmModel.php | 12 ++----------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php
index 02e6ecafaa5..f2ddb37c493 100644
--- a/app/controllers/my_courses.php
+++ b/app/controllers/my_courses.php
@@ -90,7 +90,7 @@ class MyCoursesController extends AuthenticatedController
'order' => 'asc',
'studygroups_enabled' => Config::get()->MY_COURSES_ENABLE_STUDYGROUPS,
'deputies_enabled' => Config::get()->DEPUTIES_ENABLE,
- ]) ?? [];
+ ]);
// Waiting list
$this->waiting_list = MyRealmModel::getWaitingList($GLOBALS['user']->id);
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index 1ba90a574e2..439094fde12 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -282,7 +282,7 @@ class MyRealmModel
*
* @param string $sem Semester index
* @param array $params Additional parameters
- * @return array|null
+ * @return array
*/
public static function getPreparedCourses($sem = 'all', $params = [])
{
@@ -298,10 +298,6 @@ class MyRealmModel
$param_array = 'name seminar_id visible veranstaltungsnummer start_time duration_time status visible ';
$param_array .= 'chdate admission_binding modules admission_prelim';
- if (!$courses) {
- return null;
- }
-
// filtering courses
$member_ships = User::findCurrent()->course_memberships->toGroupedArray('seminar_id', 'status gruppe');
$children = [];
@@ -393,10 +389,6 @@ class MyRealmModel
$sem_courses[$semester_assign[$parent]][$parent]['children'] = $kids;
}
- if (!$sem_courses) {
- return null;
- }
-
if (!empty($params['main_navigation'])) {
return $sem_courses;
}
@@ -444,7 +436,7 @@ class MyRealmModel
self::groupByMVVModule($sem_courses);
}
- return $sem_courses ?: null;
+ return $sem_courses;
}
/**
--
GitLab