From 141f919ca7fa316f44aef3d13a7c06468239f9af Mon Sep 17 00:00:00 2001 From: Hugo Sales Date: Sun, 22 Aug 2021 12:57:37 +0100 Subject: [PATCH] [CONFIG][TESTS] Fix error found by AdminPanel test --- src/Util/Common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Util/Common.php b/src/Util/Common.php index 3d1d46e64d..c9703c6679 100644 --- a/src/Util/Common.php +++ b/src/Util/Common.php @@ -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'); }