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

Browse source
This commit is contained in:
Andreas Steiner 2024-07-24 15:55:59 +02:00
commit 6f31664c05
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Settings.php
View file

@ -169,7 +169,7 @@ class Settings implements \Iterator, \Countable
$siteConf = $this->buildFileName(self::SITE); $siteConf = $this->buildFileName(self::SITE);
if (file_exists($siteConf)) 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 ] ) ) if ( isset( $this->modes[ $this->mode ] ) )
{ {
$modeConf = $this->buildFileName( $this->modes[ $this->mode ] ); $modeConf = $this->buildFileName( $this->modes[ $this->mode ] );
if ( file_exists($modeConf) ) if ( file_exists($modeConf) )
{ {
$this->settings = array_replace_recursive( $this->settings, require($modeConf) ); $this->settings = array_replace_recursive( $this->settings, require($modeConf) );