diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-11-28 12:48:19 -0800 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-11-28 12:48:19 -0800 |
| commit | 0cbe9d79baec7aa3a38dfc9b5db8b5a1eee7b930 (patch) | |
| tree | 5158888d5484c74ebbeadb78087f56c664ac4846 /apps | |
| parent | f723bf744a2c32e310461fa51f85fd3bb0e9fa44 (diff) | |
| parent | b3724cd9c699522c8ec3c6754670b505d3481736 (diff) | |
| download | nextcloud-server-0cbe9d79baec7aa3a38dfc9b5db8b5a1eee7b930.tar.gz nextcloud-server-0cbe9d79baec7aa3a38dfc9b5db8b5a1eee7b930.zip | |
Merge pull request #6106 from owncloud/fix_preview_creation
Fix preview creation
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_trashbin/ajax/preview.php | 10 | ||||
| -rw-r--r-- | apps/files_versions/ajax/preview.php | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php index a0846b051c7..ce432f4d14e 100644 --- a/apps/files_trashbin/ajax/preview.php +++ b/apps/files_trashbin/ajax/preview.php @@ -29,8 +29,14 @@ if($maxX === 0 || $maxY === 0) { } try{ - $preview = new \OC\Preview(\OC_User::getUser(), 'files_trashbin/files'); - $preview->setFile($file); + $preview = new \OC\Preview(\OC_User::getUser(), 'files_trashbin/files', $file); + $view = new \OC\Files\View('/'.\OC_User::getUser(). '/files_trashbin/files'); + if ($view->is_dir($file)) { + $mimetype = 'httpd/unix-directory'; + } else { + $mimetype = \OC_Helper::getFileNameMimeType(pathinfo($file, PATHINFO_FILENAME)); + } + $preview->setMimetype($mimetype); $preview->setMaxX($maxX); $preview->setMaxY($maxY); $preview->setScalingUp($scalingUp); diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php index 62bcc03f522..31525028ef3 100644 --- a/apps/files_versions/ajax/preview.php +++ b/apps/files_versions/ajax/preview.php @@ -37,8 +37,9 @@ if($maxX === 0 || $maxY === 0) { } try{ - $preview = new \OC\Preview($user, 'files_versions'); - $preview->setFile($file.'.v'.$version); + $preview = new \OC\Preview($user, 'files_versions', $file.'.v'.$version); + $mimetype = \OC_Helper::getFileNameMimeType($file); + $preview->setMimetype($mimetype); $preview->setMaxX($maxX); $preview->setMaxY($maxY); $preview->setScalingUp($scalingUp); |