Skip to content
Snippets Groups Projects
Commit abccff7f authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

prevent php8 warning by using the same underlying data, fixes #4948

Closes #4948

Merge request studip/studip!3713
parent 95b43792
No related branches found
No related tags found
No related merge requests found
...@@ -89,8 +89,8 @@ class Settings_NotificationController extends Settings_SettingsController ...@@ -89,8 +89,8 @@ class Settings_NotificationController extends Settings_SettingsController
'visible' => $seminar['visible'], 'visible' => $seminar['visible'],
'gruppe' => $su->gruppe, 'gruppe' => $su->gruppe,
'sem_status' => $seminar->status, 'sem_status' => $seminar->status,
'sem_number' => Semester::getIndexById($seminar->start_semester->id), 'sem_number' => Semester::getIndexById($seminar->start_semester->id, true, true),
'sem_number_end' => Semester::getIndexById($seminar->end_semester->id ?? '') ?: '-1', 'sem_number_end' => Semester::getIndexById($seminar->end_semester->id ?? '', true, true) ?: '-1',
]; ];
if ($group_field) { if ($group_field) {
fill_groups($groups, Semester::getIndexById($seminar->start_semester->id), [ fill_groups($groups, Semester::getIndexById($seminar->start_semester->id), [
......
...@@ -316,8 +316,8 @@ class MyRealmModel ...@@ -316,8 +316,8 @@ class MyRealmModel
$_course['visitdate'] = $visits[$course->id][0]['visitdate']; $_course['visitdate'] = $visits[$course->id][0]['visitdate'];
$_course['user_status'] = $user_status; $_course['user_status'] = $user_status;
$_course['gruppe'] = !$is_deputy ? $member_ships[$course->id]['gruppe'] ?? null : ($deputy ? $deputy->gruppe : null); $_course['gruppe'] = !$is_deputy ? $member_ships[$course->id]['gruppe'] ?? null : ($deputy ? $deputy->gruppe : null);
$_course['sem_number_end'] = $course->isOpenEnded() ? $max_sem_key : Semester::getIndexById($course->end_semester->id); $_course['sem_number_end'] = $course->isOpenEnded() ? $max_sem_key : Semester::getIndexById($course->end_semester->id, true, true);
$_course['sem_number'] = Semester::getIndexById($course->start_semester->id ?? null); $_course['sem_number'] = Semester::getIndexById($course->start_semester->id ?? null, true, true);
$_course['tools'] = $course->tools; $_course['tools'] = $course->tools;
$_course['name'] = $course->name; $_course['name'] = $course->name;
$_course['temp_name'] = $course->name; $_course['temp_name'] = $course->name;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment