diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2015-03-11 17:08:25 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2015-03-16 12:44:10 +0100 |
| commit | 4c4c0fa12066b9dace5d9689836fe4a70141a2d9 (patch) | |
| tree | 65ac1c648c0fa48f4a5c79885e373375d7b94cfb | |
| parent | 1075914f8ab8f5f4c20ab7f0b9ce35e9a9e2ffe1 (diff) | |
| download | nextcloud-server-4c4c0fa12066b9dace5d9689836fe4a70141a2d9.tar.gz nextcloud-server-4c4c0fa12066b9dace5d9689836fe4a70141a2d9.zip | |
Use the PreviewManager where possible
| -rw-r--r-- | apps/files_sharing/templates/public.php | 4 | ||||
| -rw-r--r-- | core/ajax/preview.php | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 4ec4d264b31..26fee0b8694 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -20,10 +20,10 @@ OCP\Util::addScript('files', 'filelist'); OCP\Util::addscript('files', 'keyboardshortcuts'); $thumbSize=1024; -$previewSupported = OC\Preview::isMimeSupported($_['mimetype']) ? 'true' : 'false'; +$previewSupported = \OC::$server->getPreviewManager()->isMimeSupported($_['mimetype']) ? 'true' : 'false'; ?> -<?php if ( \OC\Preview::isMimeSupported($_['mimetype'])): /* This enables preview images for links (e.g. on Facebook, Google+, ...)*/?> +<?php if ($previewSupported === 'true'): /* This enables preview images for links (e.g. on Facebook, Google+, ...)*/?> <link rel="image_src" href="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $thumbSize, 'y' => $thumbSize, 'file' => $_['directory_path'], 't' => $_['dirToken']))); ?>" /> <?php endif; ?> diff --git a/core/ajax/preview.php b/core/ajax/preview.php index f7e24e0ec28..12bc80e4037 100644 --- a/core/ajax/preview.php +++ b/core/ajax/preview.php @@ -29,13 +29,12 @@ if ($maxX === 0 || $maxY === 0) { exit; } -$preview = new \OC\Preview(\OC_User::getUser(), 'files'); - $info = \OC\Files\Filesystem::getFileInfo($file); -if (!$info instanceof OCP\Files\FileInfo || !$always && !$preview->isAvailable($info)) { +if (!$info instanceof OCP\Files\FileInfo || !$always && !\OC::$server->getPreviewManager()->isAvailable($info)) { \OC_Response::setStatus(404); } else { + $preview = new \OC\Preview(\OC_User::getUser(), 'files'); $preview->setFile($file); $preview->setMaxX($maxX); $preview->setMaxY($maxY); |