diff options
| author | Robin Appelman <robin@icewind.nl> | 2019-03-13 11:42:01 +0100 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2019-03-13 11:42:01 +0100 |
| commit | 0d41138c6ec13c79106a5bc63299ec1791e6f933 (patch) | |
| tree | a95694a7a1dcf293dae7f43173698bb01229a37f /apps/files_trashbin | |
| parent | f0c85a0f5f84f6bacd4a58520669a71aff944660 (diff) | |
| download | nextcloud-server-0d41138c6ec13c79106a5bc63299ec1791e6f933.tar.gz nextcloud-server-0d41138c6ec13c79106a5bc63299ec1791e6f933.zip | |
prevent recursion when moving a file to the trashbin
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/Trash/TrashManager.php | 5 |
1 files changed, 4 insertions, 1 deletions
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; } |