feat(Config.php): change array_merge to array_replace_recursive when merging configs

szaimen · backportbot[bot] · commit 1265a54486c2 · 2026-01-07T11:05:01.000Z
Signed-off-by: Simon L. &lt;szaimen@e.mail.de&gt;
diff --git a/lib/private/Config.php b/lib/private/Config.php
@@ -222,7 +222,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
`@@ -222,7 +222,7 @@ private function readData() {`
`222`	`222`	`throw new \Exception($errorMessage);`
`223`	`223`	`}`
`224`	`224`	`if (isset($CONFIG) && is_array($CONFIG)) {`
`225`		`- $this->cache = array_merge($this->cache, $CONFIG);`
	`225`	`+ $this->cache = array_replace_recursive($this->cache, $CONFIG);`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`