diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-20 16:34:22 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-20 16:34:22 +0100 |
| commit | afa88729558b8dd26413ff49ada8678b1b6521c6 (patch) | |
| tree | 86e6c662bef91e633816f2d72dac5115770c92ec /core | |
| parent | a45e45df1ec357f9b390463ed74100e6c8b07fe7 (diff) | |
| parent | 8f06353882877c948e15e0340615cc7d25c44b83 (diff) | |
| download | nextcloud-server-afa88729558b8dd26413ff49ada8678b1b6521c6.tar.gz nextcloud-server-afa88729558b8dd26413ff49ada8678b1b6521c6.zip | |
Merge pull request #14857 from owncloud/preview-provider-registration-in-manager
Preview provider registration in manager
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/preview.php | 5 | ||||
| -rw-r--r-- | core/avatar/avatarcontroller.php | 2 |
2 files changed, 3 insertions, 4 deletions
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); diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php index f63e02b7761..b63c8ad53b5 100644 --- a/core/avatar/avatarcontroller.php +++ b/core/avatar/avatarcontroller.php @@ -95,7 +95,7 @@ class AvatarController extends Controller { $avatar = $this->avatarManager->getAvatar($userId); $image = $avatar->get($size); - if ($image instanceof \OC_Image) { + if ($image instanceof \OCP\IImage) { $resp = new DataDisplayResponse($image->data(), Http::STATUS_OK, ['Content-Type' => $image->mimeType()]); |