diff options
| author | Robin Appelman <icewind@owncloud.com> | 2015-12-14 15:59:36 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2015-12-14 16:07:31 +0100 |
| commit | b7c217290f0d1974c048bb467e2c3cee0bbc6fc2 (patch) | |
| tree | 0aa2fb80e54ad16950336ef60a3b681bc7c3b43e /apps | |
| parent | c47f214cf360234af3d55bef8f1606fc106eba73 (diff) | |
| download | nextcloud-server-b7c217290f0d1974c048bb467e2c3cee0bbc6fc2.tar.gz nextcloud-server-b7c217290f0d1974c048bb467e2c3cee0bbc6fc2.zip | |
Handle non existing files in version previews
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_versions/ajax/preview.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php index d7bc44f17a2..3dfc8e3983d 100644 --- a/apps/files_versions/ajax/preview.php +++ b/apps/files_versions/ajax/preview.php @@ -47,14 +47,18 @@ if($maxX === 0 || $maxY === 0) { try { list($user, $file) = \OCA\Files_Versions\Storage::getUidAndFilename($file); - $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); + if (is_null($file)) { + \OC_Response::setStatus(404); + } else { + $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); - $preview->showPreview(); + $preview->showPreview(); + } } catch (\OCP\Files\NotFoundException $e) { \OC_Response::setStatus(404); \OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG); |