Merge pull request #27271 from owncloud/fix-trash-tooltip

In the real world id is an initial filename
owncloud · Feb 28, 2017 · 4a77379 · 4a77379
2 parents e064855 + f71cd07
commit 4a77379
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/apps/files_trashbin/lib/Helper.php b/apps/files_trashbin/lib/Helper.php
@@ -72,8 +72,9 @@ public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDesc
 				$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);
 				}
@@ -89,7 +90,7 @@ public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDesc
 				'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);
 		}