diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-01-09 02:27:51 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-01-09 02:27:51 +0100 |
| commit | 6c5925397871b018fa6bad147b0055a6ab1d2f5d (patch) | |
| tree | ec0772a2f93f834e686efbdf76504e9f7214cce1 /core | |
| parent | 6a5f12beca175a0b9a951fa844eacfd21a8df3de (diff) | |
| parent | ceaaab6295ad30e066c9d5505e9131136bafbdb8 (diff) | |
| download | nextcloud-server-6c5925397871b018fa6bad147b0055a6ab1d2f5d.tar.gz nextcloud-server-6c5925397871b018fa6bad147b0055a6ab1d2f5d.zip | |
Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-files
Verify whether type is correct
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/preview.php | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/core/ajax/preview.php b/core/ajax/preview.php index 03dfb483062..f7e24e0ec28 100644 --- a/core/ajax/preview.php +++ b/core/ajax/preview.php @@ -29,21 +29,17 @@ if ($maxX === 0 || $maxY === 0) { exit; } -try { - $preview = new \OC\Preview(\OC_User::getUser(), 'files'); - $info = \OC\Files\Filesystem::getFileInfo($file); - if (!$always and !$preview->isAvailable($info)) { - \OC_Response::setStatus(404); - } else { - $preview->setFile($file); - $preview->setMaxX($maxX); - $preview->setMaxY($maxY); - $preview->setScalingUp($scalingUp); - $preview->setKeepAspect($keepAspect); - $preview->showPreview(); - } +$preview = new \OC\Preview(\OC_User::getUser(), 'files'); -} catch (\Exception $e) { - \OC_Response::setStatus(500); - \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); +$info = \OC\Files\Filesystem::getFileInfo($file); + +if (!$info instanceof OCP\Files\FileInfo || !$always && !$preview->isAvailable($info)) { + \OC_Response::setStatus(404); +} else { + $preview->setFile($file); + $preview->setMaxX($maxX); + $preview->setMaxY($maxY); + $preview->setScalingUp($scalingUp); + $preview->setKeepAspect($keepAspect); + $preview->showPreview(); } |