Merge pull request #26039 from nextcloud/backport/25916/stable21

[stable21] Remove trash items from other trash backends when deleting all
nextcloud · Mar 11, 2021 · 1d0b210 · 1d0b210
2 parents 0e8ada1 + deb01f0
commit 1d0b210
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/apps/files_trashbin/lib/Sabre/TrashRoot.php b/apps/files_trashbin/lib/Sabre/TrashRoot.php
@@ -50,6 +50,9 @@ public function __construct(IUser $user, ITrashManager $trashManager) {
 
 	public function delete() {
 		\OCA\Files_Trashbin\Trashbin::deleteAll();
+		foreach ($this->trashManager->listTrashRoot($this->user) as $trashItem) {
+			$this->trashManager->removeItem($trashItem);
+		}
 	}
 
 	public function getName(): string {