Skip to content
Snippets Groups Projects
Commit 10b73231 authored by Elmar Ludwig's avatar Elmar Ludwig
Browse files

let MyRealmModel::getPreparedCourses() always return an array, fixes #3756

Closes #3756

Merge request studip/studip!2630
parent 93ac49bd
No related branches found
No related tags found
No related merge requests found
...@@ -90,7 +90,7 @@ class MyCoursesController extends AuthenticatedController ...@@ -90,7 +90,7 @@ class MyCoursesController extends AuthenticatedController
'order' => 'asc', 'order' => 'asc',
'studygroups_enabled' => Config::get()->MY_COURSES_ENABLE_STUDYGROUPS, 'studygroups_enabled' => Config::get()->MY_COURSES_ENABLE_STUDYGROUPS,
'deputies_enabled' => Config::get()->DEPUTIES_ENABLE, 'deputies_enabled' => Config::get()->DEPUTIES_ENABLE,
]) ?? []; ]);
// Waiting list // Waiting list
$this->waiting_list = MyRealmModel::getWaitingList($GLOBALS['user']->id); $this->waiting_list = MyRealmModel::getWaitingList($GLOBALS['user']->id);
......
...@@ -282,7 +282,7 @@ class MyRealmModel ...@@ -282,7 +282,7 @@ class MyRealmModel
* *
* @param string $sem Semester index * @param string $sem Semester index
* @param array $params Additional parameters * @param array $params Additional parameters
* @return array|null * @return array
*/ */
public static function getPreparedCourses($sem = 'all', $params = []) public static function getPreparedCourses($sem = 'all', $params = [])
{ {
...@@ -298,10 +298,6 @@ class MyRealmModel ...@@ -298,10 +298,6 @@ class MyRealmModel
$param_array = 'name seminar_id visible veranstaltungsnummer start_time duration_time status visible '; $param_array = 'name seminar_id visible veranstaltungsnummer start_time duration_time status visible ';
$param_array .= 'chdate admission_binding modules admission_prelim'; $param_array .= 'chdate admission_binding modules admission_prelim';
if (!$courses) {
return null;
}
// filtering courses // filtering courses
$member_ships = User::findCurrent()->course_memberships->toGroupedArray('seminar_id', 'status gruppe'); $member_ships = User::findCurrent()->course_memberships->toGroupedArray('seminar_id', 'status gruppe');
$children = []; $children = [];
...@@ -393,10 +389,6 @@ class MyRealmModel ...@@ -393,10 +389,6 @@ class MyRealmModel
$sem_courses[$semester_assign[$parent]][$parent]['children'] = $kids; $sem_courses[$semester_assign[$parent]][$parent]['children'] = $kids;
} }
if (!$sem_courses) {
return null;
}
if (!empty($params['main_navigation'])) { if (!empty($params['main_navigation'])) {
return $sem_courses; return $sem_courses;
} }
...@@ -444,7 +436,7 @@ class MyRealmModel ...@@ -444,7 +436,7 @@ class MyRealmModel
self::groupByMVVModule($sem_courses); self::groupByMVVModule($sem_courses);
} }
return $sem_courses ?: null; return $sem_courses;
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment