Skip to content

fix(files_trashbin): cleanup trash metadata after failed cross-user moves #63070

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
AndyScherzinger merged 1 commit into from
Aug 9, 2026
+3 −1
Merged

fix(files_trashbin): cleanup trash metadata after failed cross-user moves #63070

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
4 changes: 3 additions & 1 deletion apps/files_trashbin/lib/Trashbin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,9 @@ public static function move2trash($file_path, $ownerOnly = false) {
'timestamp' => $timestamp,
]
);
self::deleteTrashRow($user, $filename, $timestamp);
// The metadata row belongs to the owner, even when another user initiated
// the deletion.
self::deleteTrashRow($owner, $filename, $timestamp);
if ($trashStorage->file_exists($trashInternalPath)) {
if ($trashStorage->is_dir($trashInternalPath)) {
$trashStorage->rmdir($trashInternalPath);
Expand Down
Loading