fix: #33454 Site config was not set in the correct order #2

Merged
norb merged 6 commits from 33454/feat-site-settings-for-business-settings into master 2024-07-30 12:48:29 +00:00
Showing only changes of commit 6f31664c05 - Show all commits

fix: #33454 Site config was not set in the correct order

Andreas Steiner 2024-07-24 15:55:59 +02:00

View file

@ -169,7 +169,7 @@ class Settings implements \Iterator, \Countable
$siteConf = $this->buildFileName(self::SITE);
if (file_exists($siteConf))
{
$localConf = array_replace_recursive($this->settings, require($siteConf));
$localConf = array_replace_recursive($localConf, require($siteConf));
}
}