From 6f31664c05a29b1b996e6923ec64fce5e5b30455 Mon Sep 17 00:00:00 2001 From: Andreas Steiner Date: Wed, 24 Jul 2024 15:55:59 +0200 Subject: [PATCH] fix: #33454 Site config was not set in the correct order --- src/Settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Settings.php b/src/Settings.php index 6ffaa7e..52c4c06 100644 --- a/src/Settings.php +++ b/src/Settings.php @@ -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) );