From ee87d929656bfb0aaa53d04716e3af5795dec1b8 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 13 Feb 2007 23:10:14 +0000 Subject: [PATCH] Use array_merge_recursive_unique() --- usr/local/www/xmlrpc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index c3c8da9f13..8b3216b7f1 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'];