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 42921d0456 - Show all commits

fix: #33454 The localConf variable cannot be false by default; in which case the site test will fail

Andreas Steiner 2024-07-29 11:41:28 +02:00

View file

@ -153,7 +153,7 @@ class Settings implements \Iterator, \Countable
// load local config without merging - we need it here for the mode
$conf = $this->buildFileName();
$localConf = false;
$localConf = [];
if (file_exists($conf)) $localConf = require($conf);
// if a mode was set in the constructor do not overwrite it