Skip to content

Remove trash items from other trash backends when deleting all #25916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 1 commit into from
Mar 10, 2021
Merged

Remove trash items from other trash backends when deleting all #25916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Remove trash items from other trash backends when deleting all 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Mar 3, 2021
commit 930b40bd8af4b646d8e6f7950a903dc11e6a8d32
3 changes: 3 additions & 0 deletions apps/files_trashbin/lib/Sabre/TrashRoot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down