X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConsole%2FConfig.php;h=cf5c09fc0a4281bf5e6fe925d768f65e396a8f6c;hb=4375edd63e44b71913bd45bf25a4a554582b581e;hp=3b92d5a784a5e7aa69fb8842d94592fb3a054664;hpb=571e37f4d4bde114d4b300871c61ac828ff160fe;p=friendica.git diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php index 3b92d5a784..cf5c09fc0a 100644 --- a/src/Core/Console/Config.php +++ b/src/Core/Console/Config.php @@ -59,7 +59,7 @@ Description Sets the value of the provided key in the category Notes: - Setting config entries which are manually set in config/local.ini.php may result in + Setting config entries which are manually set in config/local.config.php may result in conflict between database settings and the manual startup settings. Options @@ -113,7 +113,7 @@ HELP; if (is_array($value)) { foreach ($value as $k => $v) { - $this->out("{$cat}.{$key}[{$k}] => " . $v); + $this->out("{$cat}.{$key}[{$k}] => " . (is_array($v) ? implode(', ', $v) : $v)); } } else { $this->out("{$cat}.{$key} => " . $value); @@ -124,12 +124,13 @@ HELP; $cat = $this->getArgument(0); Core\Config::load($cat); - if (!is_null($a->config[$cat])) { + if ($a->getConfigCache()->get($cat) !== null) { $this->out("[{$cat}]"); - foreach ($a->config[$cat] as $key => $value) { + $catVal = $a->getConfigCache()->get($cat); + foreach ($catVal as $key => $value) { if (is_array($value)) { foreach ($value as $k => $v) { - $this->out("{$key}[{$k}] => " . $v); + $this->out("{$key}[{$k}] => " . (is_array($v) ? implode(', ', $v) : $v)); } } else { $this->out("{$key} => " . $value); @@ -147,12 +148,13 @@ HELP; $this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only'); } - foreach ($a->config as $cat => $section) { + $config = $a->getConfigCache()->getAll(); + foreach ($config as $cat => $section) { if (is_array($section)) { foreach ($section as $key => $value) { if (is_array($value)) { foreach ($value as $k => $v) { - $this->out("{$cat}.{$key}[{$k}] => " . $v); + $this->out("{$cat}.{$key}[{$k}] => " . (is_array($v) ? implode(', ', $v) : $v)); } } else { $this->out("{$cat}.{$key} => " . $value);