Fixes soft delete check, fixes nested tree restoration

octobercms · Feb 10, 2025 · 8d4d37a · 8d4d37a
1 parent 0431b2f
commit 8d4d37a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Database/Traits/NestedTree.php b/src/Database/Traits/NestedTree.php
@@ -4,7 +4,6 @@
 use October\Rain\Database\Collection;
 use October\Rain\Database\TreeCollection;
 use October\Rain\Database\Scopes\NestedTreeScope;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Exception;
 
 /**
@@ -120,7 +119,10 @@ public function initializeNestedTree()
             $this->deleteDescendants();
         });
 
-        if (static::hasGlobalScope(SoftDeletingScope::class)) {
+        if (
+            static::hasGlobalScope(\October\Rain\Database\Scopes\SoftDeleteScope::class) ||
+            static::hasGlobalScope(\Illuminate\Database\Eloquent\SoftDeletingScope::class)
+        ) {
             $this->bindEvent('model.beforeRestore', function () {
                 $this->shiftSiblingsForRestore();
             });