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

Merge pull request #3948 from nextcloud/downstream-27271 

Tooltip in trashbin with previous location
This commit is contained in:
Lukas Reschke 2017-03-23 11:57:34 +01:00 committed by GitHub
parent 9675bbd830 fb87aa61e7
commit 1f210bf273
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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