mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

In the real world id is an initial filename 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Victor Dubiniuk 2017-02-27 22:00:47 +03:00 committed by Morris Jobke
parent 528a903a7b
commit 17bed297db
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files_trashbin/lib/Helper.php
View File

@ -72,8 +72,9 @@ class Helper {
$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
}
$originalPath = '';
if (isset($originalLocations[$id][$timestamp])) {
$originalPath = $originalLocations[$id][$timestamp];
$originalName = substr($entryName, 0, -strlen($timestamp)-2);
if (isset($originalLocations[$originalName][$timestamp])) {
$originalPath = $originalLocations[$originalName][$timestamp];
if (substr($originalPath, -1) === '/') {
$originalPath = substr($originalPath, 0, -1);
}
@ -90,7 +91,7 @@ class Helper {
'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE
);
if ($originalPath) {
$i['extraData'] = $originalPath . '/' . $id;
$i['extraData'] = $originalPath . '/' . $originalName;
}
$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
}