Fixed a MySQL error when deleting an asset folder that had more than …

…15 subfolders. Partially address #8073
craftcms · Jun 17, 2021 · f3ed81f · f3ed81f
1 parent 8a38fbe
commit f3ed81f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Fixed an infinite recursion bug that could occur when validating date values.
 - Fixed a bug where it wasn’t possible to choose the parent entry when creating new Structure section entries. ([#8074](https://github.com/craftcms/cms/issues/8074))
 - Fixed a bug where element selection fields could get multiple “Choose” buttons. ([#8074](https://github.com/craftcms/cms/issues/8074))
+- Fixed a MySQL error when deleting an asset folder that had more than 15 subfolders. ([#8073](https://github.com/craftcms/cms/issues/8073))
 
 ## 3.7.0-beta.1 - 2021-06-15
 

diff --git a/src/services/Assets.php b/src/services/Assets.php
@@ -316,8 +316,11 @@ public function renameFolderById(int $folderId, string $newName): string
      */
     public function deleteFoldersByIds($folderIds, bool $deleteDir = true)
     {
+        $folders = [];
+
         foreach ((array)$folderIds as $folderId) {
             $folder = $this->getFolderById($folderId);
+            $folders[] = $folder;
 
             if ($folder) {
                 if ($deleteDir) {
@@ -335,7 +338,15 @@ public function deleteFoldersByIds($folderIds, bool $deleteDir = true)
             $elementService->deleteElement($asset, true);
         }
 
-        VolumeFolderRecord::deleteAll(['id' => $folderIds]);
+        foreach ($folders as $folder) {
+            $descendants = $this->getAllDescendantFolders($folder);
+            usort($descendants, function ($a, $b) { return substr_count($a->path, '/') < substr_count($b->path, '/');});
+
+            foreach ($descendants as $descendant) {
+                VolumeFolderRecord::deleteAll(['id' => $descendant->id]);
+            }
+            VolumeFolderRecord::deleteAll(['id' => $folder->id]);
+        }
     }
 
     /**

diff --git a/src/volumes/Local.php b/src/volumes/Local.php
@@ -170,4 +170,12 @@ protected function createAdapter(): LocalAdapter
             ],
         ]);
     }
+
+    public function deleteDirectory(string $path)
+    {
+        // SIC
+        return null;//parent::deleteDirectory($path); // TODO: Change the autogenerated stub
+    }
+
+
 }