diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2010-08-02 16:14:46 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2010-08-02 16:14:56 -0400 |
| commit | a771c04477182b5bf01fba6e8d15d9ca9c2e1db3 (patch) | |
| tree | 79eea70e33c87db0d54ed8f7a01d008dbf39aaa8 /usr/local/www/xmlrpc.php | |
| parent | 7b5c56ea91c44b1a2f3ee0c4085f65f21a2f11e0 (diff) | |
| download | pfsense-a771c04477182b5bf01fba6e8d15d9ca9c2e1db3.zip pfsense-a771c04477182b5bf01fba6e8d15d9ca9c2e1db3.tar.gz | |
Backout this commit, it was never intended to be committed
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 591001c..6e1e242 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($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']; |
