detect the correct mimetype of the files in the trashbin, therefore w…

…e have to check the filename without the appended timestamp
nextcloud · Sep 9, 2016 · 68b5366 · 68b5366
1 parent f6c7b4e
commit 68b5366
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/apps/files_trashbin/lib/Helper.php b/apps/files_trashbin/lib/Helper.php
@@ -78,11 +78,12 @@ public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDesc
 					$originalPath = substr($originalPath, 0, -1);
 				}
 			}
+			$type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
 			$i = array(
 				'name' => $name,
 				'mtime' => $timestamp,
-				'mimetype' => $entry->getMimeType(),
-				'type' => $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file',
+				'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
+				'type' => $type,
 				'directory' => ($dir === '/') ? '' : $dir,
 				'size' => $entry->getSize(),
 				'etag' => '',