From 98939e30386777a3fcfd17def183beda6079bb8a Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 16 Jul 2015 10:55:36 +0000 Subject: [PATCH] (legacy) xmlrpc sync fix for https://github.com/opnsense/core/issues/254 When the target has no entries at all, it doesn't know how to merge. --- src/etc/inc/xmlrpc/legacy.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/etc/inc/xmlrpc/legacy.inc b/src/etc/inc/xmlrpc/legacy.inc index 13ebc6279..1188072ac 100644 --- a/src/etc/inc/xmlrpc/legacy.inc +++ b/src/etc/inc/xmlrpc/legacy.inc @@ -116,6 +116,9 @@ function array_merge_recursive_unique($array0, $array1) { $result[$key] = call_user_func_array(__FUNCTION__, $args); } else { foreach($value as $vkey => $vval) { + if (!isset($result[$key]) || !is_array($result[$key])) { + $result[$key] = array(); + } $result[$key][$vkey] = $vval; } }