From abccff7fc3cc2dea53ec87cbf0fd5f40b87b02d1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 3 Dec 2024 12:38:23 +0000
Subject: [PATCH] prevent php8 warning by using the same underlying data, fixes
#4948
Closes #4948
Merge request studip/studip!3713
---
app/controllers/settings/notification.php | 4 ++--
lib/classes/MyRealmModel.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/controllers/settings/notification.php b/app/controllers/settings/notification.php
index e3efb7b883d..6e517dd0f0f 100644
--- a/app/controllers/settings/notification.php
+++ b/app/controllers/settings/notification.php
@@ -89,8 +89,8 @@ class Settings_NotificationController extends Settings_SettingsController
'visible' => $seminar['visible'],
'gruppe' => $su->gruppe,
'sem_status' => $seminar->status,
- 'sem_number' => Semester::getIndexById($seminar->start_semester->id),
- 'sem_number_end' => Semester::getIndexById($seminar->end_semester->id ?? '') ?: '-1',
+ 'sem_number' => Semester::getIndexById($seminar->start_semester->id, true, true),
+ 'sem_number_end' => Semester::getIndexById($seminar->end_semester->id ?? '', true, true) ?: '-1',
];
if ($group_field) {
fill_groups($groups, Semester::getIndexById($seminar->start_semester->id), [
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index 54252881a1d..2bd65fc9d75 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -316,8 +316,8 @@ class MyRealmModel
$_course['visitdate'] = $visits[$course->id][0]['visitdate'];
$_course['user_status'] = $user_status;
$_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'] = Semester::getIndexById($course->start_semester->id ?? null);
+ $_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, true, true);
$_course['tools'] = $course->tools;
$_course['name'] = $course->name;
$_course['temp_name'] = $course->name;
--
GitLab