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

Merge pull request #5032 from patricknelson/issue-5028-yaml-errors-empty

Browse Source 
FIX for #5028: Ensure empty YML configs don't break when merging them in.
This commit is contained in:
Damian Mooyman 2016-02-19 15:34:17 +13:00
commit 17b42a3f89
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/manifest/ConfigManifest.php
View File

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