[meta.syncable] Fix a wrong flatten case when deleting/restoring to/f…

…rom the recycle bin.
pydio · Nov 25, 2015 · 32ecc19 · 32ecc19
1 parent e7bb995
commit 32ecc19
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/src/plugins/meta.syncable/class.ChangesTracker.php b/core/src/plugins/meta.syncable/class.ChangesTracker.php
@@ -294,7 +294,11 @@ public function switchActions($actionName, $httpVars, $fileVars)
                 if ($row->node_id == $previousNodeId) {
                     $previousRow->target = $row->target;
                     $previousRow->seq = $row->seq;
-                    if ($order[$row->type] > $order[$previousRow->type]) {
+                    // Specific case, maybe linked to recycle bin management
+                    // A create should make a new node ID.
+                    if ($row->type === "create" && $previousRow->type === "delete"){
+                        $previousRow->type = "create";
+                    }else if ($order[$row->type] > $order[$previousRow->type]) {
                         $previousRow->type = $row->type;
                     }
                 } else {