diff options
| author | jim-p <jimp@pfsense.org> | 2011-05-20 10:26:36 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-05-20 10:27:29 -0400 |
| commit | aa6699fbea27f15626a8901bcf34ae6bdcc3f2e5 (patch) | |
| tree | 86ec1a5f276bab6ab57bbd21951dd159b340a44b /usr/local/www/xmlrpc.php | |
| parent | aa3c48668508fbc48d86ab56073a6bd0332bf3f8 (diff) | |
| download | pfsense-aa6699fbea27f15626a8901bcf34ae6bdcc3f2e5.zip pfsense-aa6699fbea27f15626a8901bcf34ae6bdcc3f2e5.tar.gz | |
Fix config sync issue. Resolves #1547 Fixed-by: Ermal
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 a732b95..97fbc45 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -173,7 +173,7 @@ function restore_config_section_xmlrpc($raw_params) { } // For vip section, first keep items sent from the master - $config = array_merge($config, $params[0]); + $config = array_merge_recursive_unique($config, $params[0]); /* Then add ipalias and proxyarp types already defined on the backup */ if (is_array($vipbackup) && !empty($vipbackup)) { |
