proxy.php

commit 292694bb28be6efee8eb309676432e233e97f213
parent 08ced6ed94a4ef055ab01f2770e5899d229b59b1
Author: Robin Bron <robin@finwo.nl>
Date:   Thu, 22 Dec 2016 15:20:28 +0100

Allow multiple config files

Diffstat:
M
config/index.php
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/index.php b/config/index.php
@@ -4,7 +4,7 @@ $config = array();
 
 // First load yml files
 foreach (glob(__DIR__ . '/**.yml') as $file) {
-    $config = array_merge($config, \Spyc::YAMLLoad($file));
+    $config = array_merge_recursive($config, \Spyc::YAMLLoad($file));
 }
 
 $blacklist = array(
@@ -17,7 +17,7 @@ foreach (glob(__DIR__ . '/**.php') as $file) {
             continue 2;
         }
     }
-    $config = array_merge($config, require($file));
+    $config = array_merge_recursive($config, require($file));
 }
 
 if (isset($config['_ENV'])) {