Merge pull request #14661 from nextcloud/backport/14656/stable15

[stable15] prevent recursion when moving a file to the trashbin
nextcloud · Mar 13, 2019 · cdb3602 · cdb3602
2 parents 1c7f091 + 57471cc
commit cdb3602
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/apps/files_trashbin/lib/Trash/TrashManager.php b/apps/files_trashbin/lib/Trash/TrashManager.php
@@ -99,7 +99,10 @@ public function moveToTrash(IStorage $storage, string $internalPath): bool {
 		}
 		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;
 		}