diff options
author | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-30 16:06:28 -0300 |
---|---|---|
committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-30 16:06:28 -0300 |
commit | 72423b73c7307e797c7365b74e1a1634dc89d99e (patch) | |
tree | ae7cfc535820423abd287c75e68620ad5c50d359 /usr/local/www/xmlrpc.php | |
parent | 65634b7eaf0b084121e4bcca529682da781b73d9 (diff) | |
parent | 83463e1e99cb92c0c567f5424883b5b79124ac95 (diff) | |
download | pfsense-72423b73c7307e797c7365b74e1a1634dc89d99e.zip pfsense-72423b73c7307e797c7365b74e1a1634dc89d99e.tar.gz |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/carp_status.php
usr/local/www/diag_nanobsd.php
usr/local/www/services_captiveportal_ip_edit.php
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 3986a46..a1b9ec5 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -202,7 +202,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_unique($config, $params[0]); + $config = array_merge($config, $params[0]); $mergedkeys = implode(",", array_keys($params[0])); write_config("Merged in config ({$mergedkeys} sections) from XMLRPC client."); return $xmlrpc_g['return']['true']; |