From 278cbde947d610227bd364d7c279fcc28ac91966 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 18 Apr 2023 10:39:28 +0000
Subject: [PATCH] prevent warnings, fixes #2549
Closes #2549
Merge request studip/studip!1724
---
app/views/admin/install/layout.php | 4 ++--
lib/classes/SystemChecker.php | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/views/admin/install/layout.php b/app/views/admin/install/layout.php
index 03e9a59f82a..a3a227fabca 100644
--- a/app/views/admin/install/layout.php
+++ b/app/views/admin/install/layout.php
@@ -59,14 +59,14 @@
) ?>
<?php endif; ?>
- <?php if (!$valid && $button_label): ?>
+ <?php if (!$valid && !empty($button_label)): ?>
<?= Studip\Button::create($button_label, 'continue') ?>
<?php elseif (!$valid): ?>
<?= Studip\Button::create(_('Erneut prüfen'), 'check') ?>
<?php elseif ($next_step): ?>
<?= Studip\Button::create($button_label ?? (_('Weiter') . ' >>'), 'continue') ?>
<?php else: ?>
- <?= Studip\Button::create($button_label, 'continue', ['style' => 'visibility: hidden;']) ?>
+ <?= Studip\Button::create($button_label ?? '', 'continue', ['style' => 'visibility: hidden;']) ?>
<?php endif; ?>
</div>
</div>
diff --git a/lib/classes/SystemChecker.php b/lib/classes/SystemChecker.php
index 919114a12d5..0f6b5511035 100644
--- a/lib/classes/SystemChecker.php
+++ b/lib/classes/SystemChecker.php
@@ -113,7 +113,11 @@ final class SystemChecker
$settings = [];
$settings_valid = true;
foreach ($requirements['settings'] as $setting => $state) {
- $settings[$setting] = $this->compareSetting($variables[$setting], $state, $version['present']);
+ $settings[$setting] = $this->compareSetting(
+ $variables[$setting] ?? null,
+ $state,
+ $version['present']
+ );
$settings_valid = $settings_valid && $settings[$setting]['valid'];
}
--
GitLab