From 60dcac6e3c1ee532da14c3f21409f45b339325d8 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Fri, 19 Sep 2025 08:30:30 +0200 Subject: prevent warnings, fixes #5892 Closes #5892 Merge request studip/studip!4493 --- app/controllers/file.php | 2 +- app/views/admin/user/edit.php | 4 ++-- app/views/settings/studies/studiengang.php | 2 +- lib/classes/DataFieldSelectboxEntry.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/file.php b/app/controllers/file.php index 1dbbf96..9a0ab81 100644 --- a/app/controllers/file.php +++ b/app/controllers/file.php @@ -80,7 +80,7 @@ class FileController extends AuthenticatedController throw new AccessDeniedException(); } if (Request::isPost()) { - if (is_array($_FILES['file'])) { + if (isset($_FILES['file']) && is_array($_FILES['file'])) { $validatedFiles = FileManager::handleFileUpload( $_FILES['file'], $folder, diff --git a/app/views/admin/user/edit.php b/app/views/admin/user/edit.php index d808a5b..de570cb 100644 --- a/app/views/admin/user/edit.php +++ b/app/views/admin/user/edit.php @@ -475,7 +475,7 @@ use Studip\Button, Studip\LinkButton;
  • studycourse->name), + htmlReady($usc->studycourse->name ?? _('Unbekannt')), htmlReady($usc->degree->name ?? _('Unbekannt')), htmlReady($usc->semester), _('Fachsemester') @@ -518,7 +518,7 @@ use Studip\Button, Studip\LinkButton;
      $inst_membership) : ?>
    1. - institute->name) ?> + institute?->name ?? _('Unbekannt')) ?> ?> have_studip_perm('admin', $inst_membership->institut_id)) : ?> asInput( diff --git a/app/views/settings/studies/studiengang.php b/app/views/settings/studies/studiengang.php index ec58d1f..e913cf4 100644 --- a/app/views/settings/studies/studiengang.php +++ b/app/views/settings/studies/studiengang.php @@ -43,7 +43,7 @@ studycourses as $usc): ?> studycourse->name) ?> - degree->name) ?> + degree->name ?? _('Unbekannt')) ?> fach_id, $usc->abschluss_id); ?> diff --git a/lib/classes/DataFieldSelectboxEntry.php b/lib/classes/DataFieldSelectboxEntry.php index 8ac1a3c..bb2d321 100644 --- a/lib/classes/DataFieldSelectboxEntry.php +++ b/lib/classes/DataFieldSelectboxEntry.php @@ -93,7 +93,7 @@ class DataFieldSelectboxEntry extends DataFieldEntry public function getDisplayValue($entities = true) { $value = $this->is_assoc_param - ? $this->type_param[$this->getValue()] + ? $this->type_param[$this->getValue()] ?? '' : $this->getValue(); return $entities ? htmlReady($value) : $value; } -- cgit v1.0