nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixing config value setting

Browse source
This commit is contained in:
Philipp Holzer 2019-03-26 08:13:49 +01:00
parent 9ec29f1e8e
commit 040504dca9
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Core/Update.php
View file

@ -285,14 +285,20 @@ class Update
$savedConfig = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]); $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 the db contains a config value, check it
if (DBA::isResult($savedConfig) && $fileConfig !== $savedConfig['v']) { if (isset($savedValue) && $fileConfig !== $savedValue) {
Logger::info('Difference in config found', ['cat' => $cat, 'key' => $key, 'file' => $fileConfig, 'saved' => $savedConfig['v']]); Logger::info('Difference in config found', ['cat' => $cat, 'key' => $key, 'file' => $fileConfig, 'saved' => $savedValue]);
$configFileSaver->addConfigValue($cat, $key, $savedConfig['v']); $configFileSaver->addConfigValue($cat, $key, $savedValue);
return true; return true;
// If both config values are empty, use the default value // If both config values are not set, use the default value
} elseif (empty($fileConfig) && !DBA::isResult($savedConfig)) { } elseif (!isset($fileConfig) && !isset($savedValue)) {
Logger::info('Using default for config', ['cat' => $cat, 'key' => $key, 'value' => $default]); Logger::info('Using default for config', ['cat' => $cat, 'key' => $key, 'value' => $default]);
$configFileSaver->addConfigValue($cat, $key, $default); $configFileSaver->addConfigValue($cat, $key, $default);
return true; 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 // If either the file config value isn't empty or the db value is the same as the
// file config value, skip it // file config value, skip it
} else { } 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; return false;
} }
} }