From 040504dca99e07388a685f1d6056b750ed28be3e Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin@philipp.info>
Date: Tue, 26 Mar 2019 08:13:49 +0100
Subject: [PATCH] fixing config value setting

---
 src/Core/Update.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 017e2b82e8..0d7b348b42 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -285,14 +285,20 @@ class Update
 
 		$savedConfig = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
 
+		if (DBA::isResult($savedConfig)) {
+			$savedValue = $savedConfig['v'];
+		} else {
+			$savedValue = null;
+		}
+
 		// If the db contains a config value, check it
-		if (DBA::isResult($savedConfig) && $fileConfig !== $savedConfig['v']) {
-			Logger::info('Difference in config found', ['cat' => $cat, 'key' => $key, 'file' => $fileConfig, 'saved' => $savedConfig['v']]);
-			$configFileSaver->addConfigValue($cat, $key, $savedConfig['v']);
+		if (isset($savedValue) && $fileConfig !== $savedValue) {
+			Logger::info('Difference in config found', ['cat' => $cat, 'key' => $key, 'file' => $fileConfig, 'saved' => $savedValue]);
+			$configFileSaver->addConfigValue($cat, $key, $savedValue);
 			return true;
 
-		// If both config values are empty, use the default value
-		} elseif (empty($fileConfig) && !DBA::isResult($savedConfig)) {
+		// If both config values are not set, use the default value
+		} elseif (!isset($fileConfig) && !isset($savedValue)) {
 			Logger::info('Using default for config', ['cat' => $cat, 'key' => $key, 'value' => $default]);
 			$configFileSaver->addConfigValue($cat, $key, $default);
 			return true;
@@ -300,7 +306,7 @@ class Update
 		// If either the file config value isn't empty or the db value is the same as the
 		// file config value, skip it
 		} else {
-			Logger::info('No Difference in config found', ['cat' => $cat, 'key' => $key, 'value' => $fileConfig, 'saved' => $savedConfig['v']]);
+			Logger::info('No Difference in config found', ['cat' => $cat, 'key' => $key, 'value' => $fileConfig, 'saved' => $savedValue]);
 			return false;
 		}
 	}
-- 
2.39.5