summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2021-03-10 08:57:41 +0100
committerGitHub <noreply@github.com>2021-03-10 08:57:41 +0100
commit2608dec38765410f490a3aeb78e7108b3764ec91 (patch)
tree386ef1eec3a1bf1d63e3c03d96a981aa809e834f /apps/files_trashbin
parent72dd2c96c8757e6ddb0253ece3fc7a478b307d14 (diff)
parent930b40bd8af4b646d8e6f7950a903dc11e6a8d32 (diff)
downloadnextcloud-server-2608dec38765410f490a3aeb78e7108b3764ec91.tar.gz
nextcloud-server-2608dec38765410f490a3aeb78e7108b3764ec91.zip
Merge pull request #25916 from nextcloud/bugfix/noid/trashbin-delete-all
Remove trash items from other trash backends when deleting all
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/lib/Sabre/TrashRoot.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_trashbin/lib/Sabre/TrashRoot.php b/apps/files_trashbin/lib/Sabre/TrashRoot.php
index c2e96b20d32..5d41a81e670 100644
--- a/apps/files_trashbin/lib/Sabre/TrashRoot.php
+++ b/apps/files_trashbin/lib/Sabre/TrashRoot.php
@@ -50,6 +50,9 @@ class TrashRoot implements ICollection {
public function delete() {
\OCA\Files_Trashbin\Trashbin::deleteAll();
+ foreach ($this->trashManager->listTrashRoot($this->user) as $trashItem) {
+ $this->trashManager->removeItem($trashItem);
+ }
}
public function getName(): string {