openrat-cms

commit f31bafa2020cd6290562c69199abeca54ba353fe
parent a6b63b88a708f26719a715c692650eb7871501ba
Author: Jan Dankert <devnull@localhost>
Date:   Wed,  5 Sep 2018 23:51:21 +0200

Um die Werte aus der config.yml überschreiben zu können, muss array_merge() benutzt werden.

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 += ConfigurationLoader::loadCustomConfig($file);
+                    $customConfig = array_merge( $customConfig, ConfigurationLoader::loadCustomConfig($file) );
                 else
                     error_log('Warning: ' . $file . ' is no .yml file - not loaded');