diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2023-03-22 13:56:03 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2023-03-22 13:56:03 +0000 |
| commit | 82967ed6c8946c2611c46026fc2b9e6d9bb6623d (patch) | |
| tree | c89e6070a8282139cef3ff731e1017d9c7e3309c /lib/models | |
| parent | 953de28bb8cdbb8edbf14c7f0ce81d0f5abbd8a8 (diff) | |
prevent messily hidden php8 warnings, fixes #2421issue-2373
Closes #2421
Merge request studip/studip!1615
Diffstat (limited to 'lib/models')
| -rw-r--r-- | lib/models/CourseDate.class.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php index 7f7d172..1465fa1 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; } |
