Skip to content

Commit

Permalink
Merge pull request #5032 from patricknelson/issue-5028-yaml-errors-empty
Browse files Browse the repository at this point in the history
FIX for #5028: Ensure empty YML configs don't break when merging them in.
  • Loading branch information
Damian Mooyman committed Feb 19, 2016
2 parents 7a12a59 + a34f17f commit 17b42a3
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions core/manifest/ConfigManifest.php
Original file line number Diff line number Diff line change
Expand Up @@ -652,8 +652,10 @@ public function matchesVariantRules($rules) {
* @return void
*/
public function mergeInYamlFragment(&$into, $fragment) {
foreach ($fragment as $k => $v) {
Config::merge_high_into_low($into[$k], $v);
if (is_array($fragment) || ($fragment instanceof Traversable)) {
foreach ($fragment as $k => $v) {
Config::merge_high_into_low($into[$k], $v);
}
}
}

Expand Down

0 comments on commit 17b42a3

Please sign in to comment.