sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[stable15] prevent recursion when moving a file to the trashbin
pull/14677/head
Roeland Jago Douma 2019-03-13 21:46:42 +07:00 committed by GitHub
parent 1c7f091272 57471cca04
commit cdb3602671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_trashbin/lib/Trash/TrashManager.php
Unescape Escape View File

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