Use array_merge_recursive_unique()

This commit is contained in:
Scott Ullrich 2007-02-13 23:10:14 +00:00
parent 901c53076c
commit ee87d92965

View File

@ -107,7 +107,7 @@ function merge_config_section_xmlrpc($raw_params) {
global $config, $xmlrpc_g;
$params = xmlrpc_params_to_php($raw_params);
if(!xmlrpc_auth($params)) return $xmlrpc_g['return']['authfail'];
$config = array_merge_recursive($config, $params[0]);
$config = array_merge_recursive_unique($config, $params[0]);
$mergedkeys = implode(",", array_keys($params[0]));
write_config("Merged in config ({$mergedkeys} sections) from XMLRPC client.");
return $xmlrpc_g['return']['true'];