1
0
Fork 0

Config values from local config overwrite global config

pull/568/head
Nils Adermann 2012-04-09 21:40:35 +02:00
parent 48ae8bf3ec
commit 38cc4e9e5f
1 changed files with 1 additions and 1 deletions

View File

@ -38,7 +38,7 @@ class Config
{ {
// override defaults with given config // override defaults with given config
if (!empty($config['config']) && is_array($config['config'])) { if (!empty($config['config']) && is_array($config['config'])) {
$this->config = array_merge_recursive($this->config, $config['config']); $this->config = array_replace_recursive($this->config, $config['config']);
} }
} }