Uid change

Author: fogelito

src/Database/Database.php

@@ -6170,6 +6170,12 @@ public function updateDocument(string $collection, string $id, Document $documen
 
                 $skipPermissionsUpdate = ($originalPermissions === $currentPermissions);
             }
+
+            // UID change
+            if ($document->offsetExists('$id') && $document->getId() !== $id) {
+                $skipPermissionsUpdate = false;
+            }
+
             $createdAt = $document->getCreatedAt();
 
             $document = \array_merge($old->getArrayCopy(), $document->getArrayCopy());
@@ -6183,14 +6189,6 @@ public function updateDocument(string $collection, string $id, Document $documen
             }
             $document = new Document($document);
 
-            // A UID change re-keys the permission rows (_perms._document) to the
-            // new UID, so the permission block must run even when the permission
-            // set itself is unchanged. Otherwise the old rows are orphaned and the
-            // new UID is left with no permissions.
-            if ($document->getId() !== $id) {
-                $skipPermissionsUpdate = false;
-            }
-
             $attributes = $collection->getAttribute('attributes', []);
 
             $relationships = \array_filter($attributes, function ($attribute) {