openrat-cms

commit a16d8b56bf5e0ee7edf5480241c133d90605cff5
parent c2d29eecfd0559c5350c602876200990f65256f4
Author: Jan Dankert <devnull@localhost>
Date:   Thu,  6 Sep 2018 00:12:48 +0200

array_replace_recursive passt hier besser, da es rekursiv funktioniert.

Diffstat:
modules/configuration/ConfigurationLoader.class.php
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/configuration/ConfigurationLoader.class.php b/modules/configuration/ConfigurationLoader.class.php
@@ -112,7 +112,7 @@ class ConfigurationLoader
                 if   (substr($file, -4) == '.yml'    ||
                       substr($file, -5) == '.yaml'   ||
                       substr($file, -8) == '.yml.php'  )
-                    $customConfig = array_merge( $customConfig, ConfigurationLoader::loadCustomConfig($file) );
+                    $customConfig = array_replace_recursive( $customConfig, ConfigurationLoader::loadCustomConfig($file) );
                 else
                     error_log('Warning: ' . $file . ' is no .yml file - not loaded');