diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-02-10 13:53:01 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-02-10 13:53:01 +0100 |
| commit | 5ffc43cba022de3b4e60b3525f3a263699dfe2f5 (patch) | |
| tree | b7975adc64583512ccdda2e20d06f6673ba57320 /apps/files_trashbin/ajax/preview.php | |
| parent | 0ae4022fb4fc6ade3ed300205ccdcdd32863dcdc (diff) | |
| parent | 02bdb470498fb8b71f1bc582af2f55795a719c39 (diff) | |
| download | nextcloud-server-5ffc43cba022de3b4e60b3525f3a263699dfe2f5.tar.gz nextcloud-server-5ffc43cba022de3b4e60b3525f3a263699dfe2f5.zip | |
Merge branch 'master' into remove-user-storage-entry
Diffstat (limited to 'apps/files_trashbin/ajax/preview.php')
| -rw-r--r-- | apps/files_trashbin/ajax/preview.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php index ce432f4d14e..44738734b19 100644 --- a/apps/files_trashbin/ajax/preview.php +++ b/apps/files_trashbin/ajax/preview.php @@ -34,7 +34,17 @@ try{ if ($view->is_dir($file)) { $mimetype = 'httpd/unix-directory'; } else { - $mimetype = \OC_Helper::getFileNameMimeType(pathinfo($file, PATHINFO_FILENAME)); + $pathInfo = pathinfo($file); + $fileName = $pathInfo['basename']; + // if in root dir + if ($pathInfo['dirname'] === '.') { + // cut off the .d* suffix + $i = strrpos($fileName, '.'); + if ($i !== false) { + $fileName = substr($fileName, 0, $i); + } + } + $mimetype = \OC_Helper::getFileNameMimeType($fileName); } $preview->setMimetype($mimetype); $preview->setMaxX($maxX); @@ -45,4 +55,4 @@ try{ }catch(\Exception $e) { \OC_Response::setStatus(500); \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); -}
\ No newline at end of file +} |