Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 15:44:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor ConfigFileManager

Browse source
This commit is contained in:
Art4 2024-11-19 07:48:43 +00:00
parent cde93c68dc
commit 58e447f7bb
1 changed files with 48 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Core/Config/Util/ConfigFileManager.php
View file

@ -245,7 +245,10 @@ class ConfigFileManager
$fullName = $this->baseDir . DIRECTORY_SEPARATOR . '.' . $name . '.php'; $fullName = $this->baseDir . DIRECTORY_SEPARATOR . '.' . $name . '.php';
$config = []; $config = [];
if (file_exists($fullName)) { if (!file_exists($fullName)) {
return $config;
}
$a = new \stdClass(); $a = new \stdClass();
$a->config = []; $a->config = [];
include $fullName; include $fullName;
@ -283,7 +286,7 @@ class ConfigFileManager
$config['database']['database'] = $db_data; $config['database']['database'] = $db_data;
unset($db_data); unset($db_data);
} }
if (isset($config['system']['db_charset'])) { if (isset($config['system']) && isset($config['system']['db_charset'])) {
$config['database']['charset'] = $config['system']['db_charset']; $config['database']['charset'] = $config['system']['db_charset'];
} }
if (isset($pidfile)) { if (isset($pidfile)) {
@ -298,7 +301,6 @@ class ConfigFileManager
$config['system']['language'] = $lang; $config['system']['language'] = $lang;
unset($lang); unset($lang);
} }
}
return $config; return $config;
} }