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

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

Browse Source
This commit is contained in:
Hamish Friedlander 2012-05-19 14:37:16 +12:00
parent aaf91154a2
commit 18ddae3375
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/manifest/ConfigManifest.php
View File

@ -485,12 +485,7 @@ class SS_ConfigManifest {
*/ */
function mergeInYamlFragment(&$into, $fragment) { function mergeInYamlFragment(&$into, $fragment) {
foreach ($fragment as $k => $v) { foreach ($fragment as $k => $v) {
if (is_array($v) || is_object($v)) { Config::merge_high_into_low($into[$k], $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;
} }
} }