From 0d41138c6ec13c79106a5bc63299ec1791e6f933 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 13 Mar 2019 11:42:01 +0100 Subject: prevent recursion when moving a file to the trashbin Signed-off-by: Robin Appelman --- apps/files_trashbin/lib/Trash/TrashManager.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'apps/files_trashbin') diff --git a/apps/files_trashbin/lib/Trash/TrashManager.php b/apps/files_trashbin/lib/Trash/TrashManager.php index 50ab539c210..b81685efa25 100644 --- a/apps/files_trashbin/lib/Trash/TrashManager.php +++ b/apps/files_trashbin/lib/Trash/TrashManager.php @@ -99,7 +99,10 @@ class TrashManager implements ITrashManager { } try { $backend = $this->getBackendForStorage($storage); - return $backend->moveToTrash($storage, $internalPath); + $this->trashPaused = true; + $result = $backend->moveToTrash($storage, $internalPath); + $this->trashPaused = false; + return $result; } catch (BackendNotFoundException $e) { return false; } -- cgit v1.2.3