tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Empty YAML config causes invalid argument error

Browse Source
This commit is contained in:
Daniel Hensby 2015-01-08 18:26:04 +00:00
parent 745faebd81
commit 8673ac15bc
No known key found for this signature in database
GPG Key ID: E38EC566FE29EB66
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
---