Skip to content
Snippets Groups Projects
Commit 278cbde9 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

prevent warnings, fixes #2549

Closes #2549

Merge request studip/studip!1724
parent 89db6306
No related branches found
No related tags found
No related merge requests found
...@@ -59,14 +59,14 @@ ...@@ -59,14 +59,14 @@
) ?> ) ?>
<?php endif; ?> <?php endif; ?>
<?php if (!$valid && $button_label): ?> <?php if (!$valid && !empty($button_label)): ?>
<?= Studip\Button::create($button_label, 'continue') ?> <?= Studip\Button::create($button_label, 'continue') ?>
<?php elseif (!$valid): ?> <?php elseif (!$valid): ?>
<?= Studip\Button::create(_('Erneut prüfen'), 'check') ?> <?= Studip\Button::create(_('Erneut prüfen'), 'check') ?>
<?php elseif ($next_step): ?> <?php elseif ($next_step): ?>
<?= Studip\Button::create($button_label ?? (_('Weiter') . ' >>'), 'continue') ?> <?= Studip\Button::create($button_label ?? (_('Weiter') . ' >>'), 'continue') ?>
<?php else: ?> <?php else: ?>
<?= Studip\Button::create($button_label, 'continue', ['style' => 'visibility: hidden;']) ?> <?= Studip\Button::create($button_label ?? '', 'continue', ['style' => 'visibility: hidden;']) ?>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> </div>
......
...@@ -113,7 +113,11 @@ final class SystemChecker ...@@ -113,7 +113,11 @@ final class SystemChecker
$settings = []; $settings = [];
$settings_valid = true; $settings_valid = true;
foreach ($requirements['settings'] as $setting => $state) { 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']; $settings_valid = $settings_valid && $settings[$setting]['valid'];
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment