summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2007-01-25 00:18:05 +0000
committerScott Ullrich <sullrich@pfsense.org>2007-01-25 00:18:05 +0000
commit383a3d3aec7c766bbbb364136421edfa5cf45679 (patch)
tree6d9c6fa82ec2466284126f59288832237af4044b /usr
parent841c1f84be502fdbf2dfa05962a595c50fceec99 (diff)
downloadpfsense-383a3d3aec7c766bbbb364136421edfa5cf45679.zip
pfsense-383a3d3aec7c766bbbb364136421edfa5cf45679.tar.gz
Use array_merge_recursive
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/xmlrpc.php2
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'];
OpenPOWER on IntegriCloud