diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2023-02-28 09:57:24 +0000 |
|---|---|---|
| committer | David Siegfried <david.siegfried@uni-vechta.de> | 2023-02-28 09:57:24 +0000 |
| commit | 1f3ccb7701b3a8a193ed9729b3eb860a9d0f794f (patch) | |
| tree | 938b0a3b5b27c31caa29f653e0c13e41fe8ab0a6 /lib/classes/coursewizardsteps/BasicDataWizardStep.php | |
| parent | f3fe3fb33ab720b76f727d38a5366b86ffe5ad8e (diff) | |
prevent php8 warnings, fixes #2222
Closes #2222
Merge request studip/studip!1454
Diffstat (limited to 'lib/classes/coursewizardsteps/BasicDataWizardStep.php')
| -rw-r--r-- | lib/classes/coursewizardsteps/BasicDataWizardStep.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/classes/coursewizardsteps/BasicDataWizardStep.php b/lib/classes/coursewizardsteps/BasicDataWizardStep.php index e3ddc47..ce3b57f 100644 --- a/lib/classes/coursewizardsteps/BasicDataWizardStep.php +++ b/lib/classes/coursewizardsteps/BasicDataWizardStep.php @@ -193,24 +193,28 @@ class BasicDataWizardStep implements CourseWizardStep && $GLOBALS['perm']->have_perm('dozent') && !$GLOBALS['perm']->have_perm('admin') ) { - $values['lecturers'][$GLOBALS['user']->id] = true; + $values['lecturers'] = [$GLOBALS['user']->id => true]; // Remove from deputies if set. - if ($deputies && $values['deputies'][$GLOBALS['user']->id]) { + if ($deputies && isset($values['deputies'][$GLOBALS['user']->id])) { unset($values['deputies'][$GLOBALS['user']->id]); } // Add your own default deputies if applicable. if ($deputies && Config::get()->DEPUTIES_DEFAULTENTRY_ENABLE) { - $values['deputies'] = array_merge($values['deputies'] ?: [], - array_flip(Deputy::findDeputies($GLOBALS['user']->id)->pluck('user_id'))); + $values['deputies'] = array_merge( + $values['deputies'] ?? [], + array_flip(Deputy::findDeputies($GLOBALS['user']->id)->pluck('user_id')) + ); } } // Add lecturer from my courses filter. - if ($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER && !$values['lecturers'] && Request::isXhr()) { - $values['lecturers'][$GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER] = true; + if ($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER && empty($values['lecturers']) && Request::isXhr()) { + $values['lecturers'] = [$GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER => true]; // Add this lecturer's default deputies if applicable. if ($deputies && Config::get()->DEPUTIES_DEFAULTENTRY_ENABLE) { - $values['deputies'] = array_merge($values['deputies'] ?: [], - array_flip(Deputy::findDeputies($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER)->pluck('user_id'))); + $values['deputies'] = array_merge( + $values['deputies'] ?? [], + array_flip(Deputy::findDeputies($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER)->pluck('user_id')) + ); } } if (empty($values['lecturers'])) { |