Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 09:10:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing .htconfig

Browse source
This commit is contained in:
Philipp Holzer 2019-03-16 20:31:10 +01:00
parent 1acd5c7d22
commit 8c6e6b5dea
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
3 changed files with 75 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/Core/Config/Cache/ConfigCacheLoader.php
View file

@ -106,8 +106,27 @@ class ConfigCacheLoader
$config = [];
if (file_exists($filePath)) {
$a = new \stdClass();
$a->config = [];
include $filePath;
$htconfigAr = array_keys($a->config);
// map the legacy configuration structure to the current structure
foreach ($htconfigAr as $htconfig) {
if (isset($a->config[$htconfig]) && is_array($a->config[$htconfig])) {
$keys = array_keys($a->config[$htconfig]);
foreach ($keys as $key) {
$config[$htconfig][$key] = $a->config[$htconfig][$key];
}
} else {
$config['config'][$htconfig] = $a->config[$htconfig];
}
}
unset($a);
if (isset($db_host)) {
$config['database']['hostname'] = $db_host;
unset($db_host);
@ -124,8 +143,8 @@ class ConfigCacheLoader
$config['database']['database'] = $db_data;
unset($db_data);
}
if (isset($a->config['system']['db_charset'])) {
$a->config['database']['charset'] = $config['system']['charset'];
if (isset($config['system']['db_charset'])) {
$config['database']['charset'] = $config['system']['db_charset'];
}
if (isset($pidfile)) {
$config['system']['pidfile'] = $pidfile;
@ -139,22 +158,6 @@ class ConfigCacheLoader
$config['system']['language'] = $lang;
unset($lang);
}
if (isset($admin_email)) {
$config['config']['admin_email'] = $admin_email;
unset($admin_email);
}
if (isset($admin_nickname)) {
$config['config']['admin_nickname'] = $admin_nickname;
unset($admin_nickname);
}
if (isset($php_path)) {
$config['config']['php_path'] = $php_path;
unset($php_path);
}
if (isset($max_import_size)) {
$config['config']['max_import_size'] = $max_import_size;
unset($max_import_size);
}
}
return $config;