keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

straight the config value check

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

18
src/Core/Update.php
View file

@ -285,22 +285,24 @@ class Update
$savedConfig = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]); $savedConfig = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $key]);
if (!DBA::isResult($savedConfig)) { // If the db contains a config value, check it
$savedConfig = null; if (DBA::isResult($savedConfig) && $fileConfig !== $savedConfig['v']) {
}
if ($fileConfig !== $savedConfig['v']) {
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' => $savedConfig['v']]);
$configFileSaver->addConfigValue($cat, $key, $savedConfig['v']); $configFileSaver->addConfigValue($cat, $key, $savedConfig['v']);
} elseif (empty($fileConfig) && empty($savedConfig)) { return true;
// If both config values are empty, use the default value
} elseif (empty($fileConfig) && !DBA::isResult($savedConfig)) {
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;
// If either the file config value isn't empty or the db value is the same as the
// 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' => $savedConfig['v']]);
return false; return false;
} }
return true;
} }
/** /**