Commit 63af1e7c authored by Ad Schellevis's avatar Ad Schellevis

(xmlrpc) interpret mvc/array type objects in xmlrpc server sync procedure

parent 2751f6f9
......@@ -84,8 +84,10 @@ function merge_config_attributes(&$cnf_source, &$cnf_dest)
{
foreach ($cnf_source as $cnf_key => &$cnf_value) {
if (is_array($cnf_value)) {
if (!isset($cnf_dest[$cnf_key]) || !is_array($cnf_dest[$cnf_key]) ||
(count($cnf_dest[$cnf_key]) > 0 && isset($cnf_dest[$cnf_key][0]))) {
if (!isset($cnf_dest[$cnf_key]) || !is_array($cnf_dest[$cnf_key]) || // new
(count($cnf_dest[$cnf_key]) > 0 && isset($cnf_dest[$cnf_key][0])) || // sequenced item
(count($cnf_dest[$cnf_key]) > 0 && isset($cnf_dest[$cnf_key]['@attributes']['uuid'])) // mvc array
) {
// (re)set destination array when new or containing a sequenced list of items
$cnf_dest[$cnf_key] = array();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment