wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always use the same relative Path (Starting from users home dir. i.e.: "/files_trashbin/...")

Browse source
This commit is contained in:
Steven Bühner 2016-09-05 14:24:04 +02:00 committed by Lukas Reschke
parent 55fe036dbf
commit 2b37dc9c9e
No known key found for this signature in database
GPG key ID: B9F6980CF6E759B1
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/files_trashbin/lib/Trashbin.php
View file

@ -472,8 +472,12 @@ class Trashbin {
$view = new View('/' . $user);
$fileInfos = $view->getDirectoryContent('files_trashbin/files');
foreach($fileInfos as $fileInfo){
$path = $view->getRelativePath($fileInfo->getPath());
// Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore)
$filePaths = array();
foreach($fileInfos as $key => $fileInfo){
$filePaths[] = $path = $view->getRelativePath($fileInfo->getPath());
unset($fileInfo[$key]); // save memory
self::emitTrashbinPreDelete($path);
}
@ -481,8 +485,7 @@ class Trashbin {
$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
$query->execute(array($user));
foreach($fileInfos as $fileInfo){
$path = $view->getRelativePath($fileInfo->getPath());
foreach($filePaths as $path){
self::emitTrashbinPostDelete($path);
}