Delete collection tree files when deleting collections

statamic · Dec 11, 2023 · ecce5a3 · ecce5a3
1 parent dc83887
commit ecce5a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
@@ -732,6 +732,10 @@ public function delete()
             $entry->delete();
         });
 
+        if ($this->hasStructure()) {
+            $this->structure()->trees()->each->delete();
+        }
+
         Facades\Collection::delete($this);
 
         CollectionDeleted::dispatch($this);

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
@@ -190,7 +190,7 @@ public function delete()
                     if (optional($parent)->isRoot()) {
                         $parent = null;
                     }
-                    $this->page()->pages()->all()->each(function ($child) use ($tree, $parent) {
+                    $this->page()?->pages()->all()->each(function ($child) use ($tree, $parent) {
                         $tree->move($child->id(), optional($parent)->id());
                     });
                     $tree->remove($this);