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

Merge pull request #10999 from nupplaphil/bug/configcache_set

Browse source 
Fix Installer setup
This commit is contained in:
Hypolite Petovan 2021-11-19 17:59:32 -05:00 committed by GitHub
parent 7ccfbd8ef2 2a22ddcf85
commit 5a9ef594bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Module/Install.php
View file

@ -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);
}
}
}