tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 01:49:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5395 from dhensby/pulls/3.3/empty-manifest-fix

Browse Source 
MINOR Empty YAML config causes invalid argument error
This commit is contained in:
Damian Mooyman 2016-05-04 10:48:28 +12:00
commit 5925b65547
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/manifest/ConfigManifest.php
View File

@ -652,8 +652,10 @@ class SS_ConfigManifest {
* @return void
*/
public function mergeInYamlFragment(&$into, $fragment) {
foreach ($fragment as $k => $v) {
Config::merge_high_into_low($into[$k], $v);
if ($fragment) {
foreach ($fragment as $k => $v) {
Config::merge_high_into_low($into[$k], $v);
}
}
}

0
tests/core/manifest/fixtures/configmanifest/mysite/_config/empty.yml Normal file
View File

3
tests/core/manifest/fixtures/configmanifest/mysite/_config/namedempty.yml Normal file
View File

@ -0,0 +1,3 @@
---
Name: emptyconfig
---