diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-12-14 18:34:14 +0300 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-12-14 18:34:14 +0300 |
| commit | 54365755644e7e8757d3834285e7c7a36d00c09c (patch) | |
| tree | 7c3651b13acb100ebde7006ad5c5455dc4827b05 | |
| parent | 85e068a723c09d0f01ab3e10aa6a3f6a8c4c3227 (diff) | |
| parent | f746100e13dcadf8a2b6d311422a1c66c959565c (diff) | |
Merge pull request #21191 from owncloud/preview-non-existing-7
[7.0] Handle non existing files in version previews
| -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 bd9b7366ab0..105616911cf 100644 --- a/apps/files_versions/ajax/preview.php +++ b/apps/files_versions/ajax/preview.php @@ -31,14 +31,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(\Exception $e) { \OC_Response::setStatus(500); \OC_Log::write('core', $e->getmessage(), \OC_Log::DEBUG); |