Merge pull request #1346 from nextcloud/trash-detect-correct-mimetype

deleted files, fix mimetype detection
nextcloud · Sep 10, 2016 · ef4eaae · ef4eaae
2 parents 341d4f0 + 68b5366
commit ef4eaae
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' => '',