mirror of
https://github.com/nextcloud/server.git
synced 2026-04-25 16:19:06 -04:00
feat(Config.php): change array_merge to array_replace_recursive when merging configs
Signed-off-by: Simon L. <szaimen@e.mail.de>
This commit is contained in:
parent
ae4f4e3af2
commit
1be03aaa2b
1 changed files with 1 additions and 1 deletions
|
|
@ -242,7 +242,7 @@ class Config {
|
|||
throw new \Exception($errorMessage);
|
||||
}
|
||||
if (isset($CONFIG) && is_array($CONFIG)) {
|
||||
$this->cache = array_merge($this->cache, $CONFIG);
|
||||
$this->cache = array_replace_recursive($this->cache, $CONFIG);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue