Sync: use setProperties

2016-02-23 09:08:14 +01:00 · 2016-02-23 09:08:14 +01:00 · 037b3178a0
parent ad9f232e7b
commit 037b3178a0
1 changed files with 3 additions and 1 deletions
--- a/library/Director/Import/Sync.php
+++ b/library/Director/Import/Sync.php
@ -444,7 +444,9 @@ class Sync
                        break;

                    case 'merge':
-                        $objects[$key]->merge($object);
+                        // TODO: re-evaluate merge settings. vars.x instead of
+                        //       just "vars" might suffice.
+                        $objects[$key]->setProperties($object);
                        break;

                    default: