Merge pull request #429 from JHeimbach/fix-configloading

stop config.yml on loading again
This commit is contained in:
Daniel Rudolf 2018-04-29 17:31:28 +02:00 committed by GitHub
commit af237c1d67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -894,7 +894,7 @@ class Pico
// merge $config of config/*.yml files
$configFiles = $this->getFilesGlob($this->getConfigDir() . '*.yml');
foreach ($configFiles as $configFile) {
if ($configFile !== 'config.yml') {
if ($configFile !== $this->getConfigDir() . 'config.yml') {
$this->config += $loadConfigClosure($configFile);
}
}