Merge pull request #14656 from nextcloud/trash-prevent-recursion
prevent recursion when moving a file to the trashbin
This commit is contained in:
commit
cdd84d6631
|
@ -99,7 +99,10 @@ class TrashManager implements ITrashManager {
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
$backend = $this->getBackendForStorage($storage);
|
$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) {
|
} catch (BackendNotFoundException $e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue