10.6 Fix restore assets from recycle bin

10.6 Fix recursive restore from recycle bin by adding missing save argument
CandoImage · Oct 7, 2024 · 0b4fe6b · 0b4fe6b
1 parent dd81ef4
commit 0b4fe6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/models/Asset.php b/models/Asset.php
@@ -770,7 +770,7 @@ protected function update($params = [])
 
                 // delete old legacy file if exists
                 $dbPath = $this->getDao()->getCurrentFullPath();
-                if ($dbPath !== $path && $storage->fileExists($dbPath)) {
+                if ($dbPath && $dbPath !== $path && $storage->fileExists($dbPath)) {
                     $storage->delete($dbPath);
                 }
 

diff --git a/models/Element/Recyclebin/Item.php b/models/Element/Recyclebin/Item.php
@@ -306,7 +306,7 @@ protected function doRecursiveRestore(Element\ElementInterface $element)
             $element->markAllLazyLoadedKeysAsLoaded();
             $element->setOmitMandatoryCheck(true);
         }
-        $element->save();
+        $element->save(['isRecycleBinRestore' => true]);
 
         if (method_exists($element, 'getChildren')) {
             if ($element instanceof DataObject\AbstractObject) {