From 861c32e6889f33faff7f8fbb69d287f9e57d478b Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Tue, 1 Apr 2025 09:07:31 +0000 Subject: prevent php8 warnings, fixes #5441 Closes #5441 Merge request studip/studip!4084 --- app/controllers/search/studiengaenge.php | 2 +- app/views/admission/institute-select.php | 10 ++++--- app/views/settings/statusgruppen/_optgroup.php | 2 +- app/views/settings/statusgruppen/_options.php | 10 +++++-- app/views/shared/download/mhb.php | 15 +--------- app/views/shared/modul/_modullvs.php | 4 +-- lib/classes/MvvPerm.php | 38 ++++++++++++++------------ lib/functions.php | 2 +- lib/models/ContentTermsOfUse.class.php | 9 ++++-- lib/models/Courseware/StructuralElement.php | 18 +++++++----- lib/models/FileRef.php | 2 +- lib/models/SimpleORMap.class.php | 7 +++-- lib/models/Studiengang.php | 6 ++-- lib/models/resources/ResourceBooking.class.php | 4 +-- templates/sidebar/room-search-widget.php | 5 +--- 15 files changed, 70 insertions(+), 64 deletions(-) diff --git a/app/controllers/search/studiengaenge.php b/app/controllers/search/studiengaenge.php index ae27106..ec2bdf7 100644 --- a/app/controllers/search/studiengaenge.php +++ b/app/controllers/search/studiengaenge.php @@ -524,7 +524,7 @@ class Search_StudiengaengeController extends MVVController foreach ($this->semesters as $sem) { $options[$sem['semester_id']] = $sem['name']; } - $widget->setOptions($options, $this->active_sem->id); + $widget->setOptions($options, $this->active_sem->id ?? null); $widget->setMaxLength(100); $sidebar->addWidget($widget, 'sem_filter'); } diff --git a/app/views/admission/institute-select.php b/app/views/admission/institute-select.php index 7453b5e..ed2df3f 100644 --- a/app/views/admission/institute-select.php +++ b/app/views/admission/institute-select.php @@ -13,10 +13,12 @@ - - render_partial('settings/statusgruppen/_options', ['data' => $row['groups']]) ?> - + render_partial('settings/statusgruppen/_optgroup', ['data' => $row['sub']]) ?> diff --git a/app/views/settings/statusgruppen/_options.php b/app/views/settings/statusgruppen/_options.php index 1115564..6f66b03 100644 --- a/app/views/settings/statusgruppen/_options.php +++ b/app/views/settings/statusgruppen/_options.php @@ -1,5 +1,11 @@ - - + $row): ?>