upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #57401 from nextcloud/backport/57371/stable32

Browse source
This commit is contained in:
Benjamin Gaussorgues 2026-01-08 09:04:16 +01:00 committed by GitHub
commit 76c9189bad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/Config.php
View file

@ -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);
}
}