nupplaPhil
/
friendica-directory
forked from friendica/friendica-directory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add deep merge between default and local settings

This commit is contained in:
Hypolite Petovan 2018-11-15 23:30:25 -05:00
parent 88fcd9610c
commit 93c2536f18
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/settings.php
View File

@ -58,6 +58,24 @@ $settings = [
],
];
function settings_merge_recursive($defaults, $local) {
$return = [];
foreach ($defaults as $key => $value) {
if (isset($local[$key])) {
if (is_array($value)) {
$return[$key] = settings_merge_recursive($value, $local[$key]);
} else {
$return[$key] = $local[$key];
}
} else {
$return[$key] = $value;
}
}
return $return;
}
return [
'settings' => $localSettings + $settings
'settings' => settings_merge_recursive($settings, $localSettings)
];