Use the PreviewManager where possible

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 4ec4d264b317e4d4c443fced41db9ae6e689095e..26fee0b869490e155e4fc33e4cf49980a58be9a6 100644 (file)
--- 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 f7e24e0ec2818ae6d3e7756727ab6907d8798dba..12bc80e403755fe2871a97270f729da03b087432 100644 (file)
--- 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);