diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2010-07-28 22:24:28 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2010-07-28 22:32:26 -0400 |
| commit | e702e6c959ff733679609564217f66f17415fe34 (patch) | |
| tree | 54bdfe1b6350cb03863a45ce1fc0eaa6e4043bb4 /usr | |
| parent | 98dee353e01e202e7a6bf54082040bc347ad62df (diff) | |
| download | pfsense-e702e6c959ff733679609564217f66f17415fe34.zip pfsense-e702e6c959ff733679609564217f66f17415fe34.tar.gz | |
Adding utility to show and maintain overflow tables
Diffstat (limited to 'usr')
| -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 6e1e242..591001c 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']; |
