diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2007-02-13 23:10:14 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2007-02-13 23:10:14 +0000 |
| commit | ee87d929656bfb0aaa53d04716e3af5795dec1b8 (patch) | |
| tree | f6efc28fcd736744a219dc6bcf5cf3a936ed358c /usr/local/www/xmlrpc.php | |
| parent | 901c53076c80b0639eee358cf4acfbd128c6fa17 (diff) | |
| download | pfsense-ee87d929656bfb0aaa53d04716e3af5795dec1b8.zip pfsense-ee87d929656bfb0aaa53d04716e3af5795dec1b8.tar.gz | |
Use array_merge_recursive_unique()
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 c3c8da9..8b3216b 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_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']; |
