rabe/Util-Settings
11
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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
Conversation 5 Commits 6 Files changed 5 +2 -2
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6f31664c05 - Show all commits

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

Prev Next
Andreas Steiner 2024-07-24 15:55:59 +02:00
commit 6f31664c05

4
src/Settings.php
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));
}
}
@ -177,7 +177,7 @@ class Settings implements \Iterator, \Countable
if ( isset( $this->modes[ $this->mode ] ) )
{
$modeConf = $this->buildFileName( $this->modes[ $this->mode ] );
if ( file_exists($modeConf) )
{
$this->settings = array_replace_recursive( $this->settings, require($modeConf) );