diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-01-30 19:55:43 +0400 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2014-01-31 19:35:23 +0400 |
| commit | 8a66c30895dc3c1158f5e7955a8fdd8d1361b25d (patch) | |
| tree | 13f63b4a15a234c22bc4744610c4246ffc8b97e5 /apps/files_trashbin | |
| parent | e6579a3c0ad760df7a8e16ed0415b397fb8966f7 (diff) | |
Fixed image preview in trashbin subdirs
Diffstat (limited to 'apps/files_trashbin')
| -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 +} |