GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CONFIG][TESTS] Fix error found by AdminPanel test

This commit is contained in:
Hugo Sales 2021-08-22 12:57:37 +01:00
parent 4d3da08b1e
commit 141f919ca7
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Util/Common.php
View File

@ -51,7 +51,7 @@ abstract class Common
{
$components = $config->has('components') ? $config->get('components') : [];
$plugins = $config->has('plugins') ? $config->get('plugins') : [];
self::$config = array_merge($config->get('gnusocial'), ['components' => $components], ['plugins' => $plugins]);
self::$config = array_merge_recursive($config->get('gnusocial'), ['components' => $components], ['plugins' => $plugins]);
self::$defaults = $config->get('gnusocial_defaults');
}