beenull/Pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #429 from JHeimbach/fix-configloading

Browse source 
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
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Pico.php
View file

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