Permalink
Browse files

BUGFIX: Make config yaml fragments merge following the same rules as …

…other config sources
  • Loading branch information...
1 parent aaf9115 commit 18ddae337514cf9769b0bbee9291a604ffe210a2 Hamish Friedlander committed May 19, 2012
Showing with 1 addition and 6 deletions.
  1. +1 −6 core/manifest/ConfigManifest.php
@@ -485,12 +485,7 @@ function matchesVariantRules($rules) {
*/
function mergeInYamlFragment(&$into, $fragment) {
foreach ($fragment as $k => $v) {
- if (is_array($v) || is_object($v)) {
- if (isset($into[$k])) { $sub = $into[$k]; $this->mergeInYamlFragment($sub, $v); $into[$k] = $sub; }
- else $into[$k] = $v;
- }
- else if (is_numeric($k)) $into[] = $v;
- else $into[$k] = $v;
+ Config::merge_high_into_low($into[$k], $v);
}
}

0 comments on commit 18ddae3

Please sign in to comment.