From 2a22ddcf8584e076fc7722a28263721a23fc01b2 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 19 Nov 2021 00:19:00 +0100 Subject: [PATCH] Fix Installer setup - value "0" can now be saved --- src/Module/Install.php | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/Module/Install.php b/src/Module/Install.php index c766dd5515..4385ba8517 100644 --- a/src/Module/Install.php +++ b/src/Module/Install.php @@ -65,7 +65,7 @@ class Install extends BaseModule * @var Core\Installer The installer */ private $installer; - + /** @var App */ protected $app; /** @var App\Mode */ @@ -385,12 +385,21 @@ class Install extends BaseModule * @param string $key The key of the setting * @param null|string $default The default value */ - private function checkSetting(Cache $configCache, array $post, $cat, $key, $default = null) + private function checkSetting(Cache $configCache, array $post, string $cat, string $key, ?string $default = null) { - $configCache->set($cat, $key, - trim(($post[sprintf('%s-%s', $cat, $key)] ?? '') ?: - ($default ?? $configCache->get($cat, $key)) - ) - ); + $value = null; + + if (isset($post[sprintf('%s-%s', $cat, $key)])) { + $value = trim($post[sprintf('%s-%s', $cat, $key)]); + } + + if (isset($value)) { + $configCache->set($cat, $key, $value, Cache::SOURCE_ENV); + return; + } + + if (isset($default)) { + $configCache->set($cat, $key, $default, Cache::SOURCE_ENV); + } } }