diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2007-01-24 23:46:53 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2007-01-24 23:46:53 +0000 |
| commit | 841c1f84be502fdbf2dfa05962a595c50fceec99 (patch) | |
| tree | b9fb1b7219da0b56b39ff65c9d63c3a627eefa94 /usr | |
| parent | dc1cd85d6f314cdb44d2603cd3fdb3588ec5d2cc (diff) | |
| download | pfsense-841c1f84be502fdbf2dfa05962a595c50fceec99.zip pfsense-841c1f84be502fdbf2dfa05962a595c50fceec99.tar.gz | |
Use array_combine()
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 12e298f..ecbc6e0 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($config, $params[0]); + $config = array_combine($config, $params[0]); $mergedkeys = implode(",", array_keys($params[0])); write_config("Merged in config ({$mergedkeys} sections) from XMLRPC client."); return $xmlrpc_g['return']['true']; |
