Merge pull request #63070 from nextcloud/jtr/fix-trashbin-move2file-failureCleanup-db

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

Author: AndyScherzinger

apps/files_trashbin/lib/Trashbin.php

@@ -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);