diff options
Diffstat (limited to 'usr/local/www/xmlrpc.php')
| -rwxr-xr-x | usr/local/www/xmlrpc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index ecbc6e0..c3c8da9 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -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_combine($config, $params[0]); + $config = array_merge_recursive($config, $params[0]); $mergedkeys = implode(",", array_keys($params[0])); write_config("Merged in config ({$mergedkeys} sections) from XMLRPC client."); return $xmlrpc_g['return']['true']; |
