From 82967ed6c8946c2611c46026fc2b9e6d9bb6623d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Wed, 22 Mar 2023 13:56:03 +0000
Subject: [PATCH] prevent messily hidden php8 warnings, fixes #2421
Closes #2421
Merge request studip/studip!1615
---
lib/models/CourseDate.class.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php
index 7f7d172f162..1465fa1d0cd 100644
--- a/lib/models/CourseDate.class.php
+++ b/lib/models/CourseDate.class.php
@@ -121,16 +121,18 @@ class CourseDate extends SimpleORMap implements PrivacyObject
*/
public static function getConsecutiveNumber($date, $semester = null)
{
- if (!isset(self::$numbered_dates[@$semester->id ?: 'all'])) {
+ $semester_id = $semester ? $semester->id : 'all';
+
+ if (!isset(self::$numbered_dates[$semester_id])) {
$db = DBManager::get();
$numbered = array_flip($db->fetchFirst("SELECT termin_id FROM termine WHERE range_id = ?" .
($semester ? " AND date BETWEEN ? AND ?" : "") .
" ORDER BY date",
$semester ? [$date->range_id, $semester->beginn, $semester->ende] : [$date->range_id]));
- self::$numbered_dates[@$semester->id ?: 'all'] = $numbered;
+ self::$numbered_dates[$semester_id] = $numbered;
}
- return isset(self::$numbered_dates[@$semester->id ?: 'all'][$date->termin_id])
- ? self::$numbered_dates[@$semester->id ?: 'all'][$date->termin_id] + 1
+ return isset(self::$numbered_dates[$semester_id][$date->termin_id])
+ ? self::$numbered_dates[$semester_id][$date->termin_id] + 1
: null;
}
--
GitLab