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

Altahrim · web-flow · commit 76c9189badbb · 2026-01-08T09:04:16.000+01:00
diff --git a/lib/private/Config.php b/lib/private/Config.php
@@ -242,7 +242,7 @@ private function readData() {
 				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);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ private function readData() {`
`242`	`242`	`throw new \Exception($errorMessage);`
`243`	`243`	`}`
`244`	`244`	`if (isset($CONFIG) && is_array($CONFIG)) {`
`245`		`- $this->cache = array_merge($this->cache, $CONFIG);`
	`245`	`+ $this->cache = array_replace_recursive($this->cache, $CONFIG);`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`