diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2023-03-02 07:25:44 +0000 |
|---|---|---|
| committer | David Siegfried <david.siegfried@uni-vechta.de> | 2023-03-02 07:25:44 +0000 |
| commit | bd60f4a8b88c1f6173cf481ea4407668c1b0c4c0 (patch) | |
| tree | 4eb4f1c8d0ca3f26d2bf0ea8d1d8c9649d0bdaad /app/controllers/my_courses.php | |
| parent | b7ce03e2b3a34a14be13775d0e31c974ab30b54f (diff) | |
fix php8 errors and warnings on my courses page, fixes #2232
Closes #2232
Merge request studip/studip!1462
Diffstat (limited to 'app/controllers/my_courses.php')
| -rw-r--r-- | app/controllers/my_courses.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php index ad34003..b3e43e3 100644 --- a/app/controllers/my_courses.php +++ b/app/controllers/my_courses.php @@ -603,7 +603,7 @@ class MyCoursesController extends AuthenticatedController if (is_array($courses)) { if ($group_field !== 'sem_number') { // tlx: If array is 2-dimensional, merge it into a 1-dimensional - $courses = call_user_func_array('array_merge', $courses); + $courses = array_merge(...array_values($courses)); } foreach ($courses as $course) { @@ -753,7 +753,7 @@ class MyCoursesController extends AuthenticatedController foreach ($_inner as $course) { $_courses[$course['seminar_id']] = $course; - if ($course['children']) { + if (isset($course['children']) && is_array($couse['children'])) { foreach ($course['children'] as $child) { $_courses[$child['seminar_id']] = $child; } |