diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-08-05 23:38:02 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-08-05 23:38:02 +0200 |
| commit | 7f44b0fd18771842bba8957dae4a50c5483a7280 (patch) | |
| tree | ba0fc682ed382ffe36e06bc6857d05d7dc196359 /apps | |
| parent | 7cb0934fa27a512b2e409361fe283d9c15560327 (diff) | |
| parent | bc91c5c2de400179b869211e658304f343f2ea31 (diff) | |
| download | nextcloud-server-7f44b0fd18771842bba8957dae4a50c5483a7280.tar.gz nextcloud-server-7f44b0fd18771842bba8957dae4a50c5483a7280.zip | |
Merge pull request #18077 from owncloud/fix_18055
Set proper mimetype for directories
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_trashbin/lib/helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php index 42412d5d4c9..f51185712a9 100644 --- a/apps/files_trashbin/lib/helper.php +++ b/apps/files_trashbin/lib/helper.php @@ -83,7 +83,7 @@ class Helper $i = array( 'name' => $id, 'mtime' => $timestamp, - 'mimetype' => \OC_Helper::getFileNameMimeType($id), + 'mimetype' => $view->is_dir($dir . '/' . $entryName) ? 'httpd/unix-directory' : \OC_Helper::getFileNameMimeType($id), 'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file', 'directory' => ($dir === '/') ? '' : $dir, ); |