summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-09-13 19:23:51 +0200
committerGitHub <noreply@github.com>2016-09-13 19:23:51 +0200
commitb6439da1288d629eaf07d3d6f2497f3583fd11e7 (patch)
tree1d7b8c1854dadb1f666983e4deb48202dba47ade /apps
parent314dc0ef9172b2765ccd0cae8afe777bec91a13d (diff)
parentf56ae37e8fe31afb109889816273c21704361f15 (diff)
downloadnextcloud-server-b6439da1288d629eaf07d3d6f2497f3583fd11e7.tar.gz
nextcloud-server-b6439da1288d629eaf07d3d6f2497f3583fd11e7.zip
Merge pull request #1338 from nextcloud/fix-trashbin-errors
Opening the trashbin causes errors in log for files without preview
Diffstat (limited to 'apps')
-rw-r--r--apps/files_trashbin/ajax/preview.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php
index 1a0131da28c..3f895161f00 100644
--- a/apps/files_trashbin/ajax/preview.php
+++ b/apps/files_trashbin/ajax/preview.php
@@ -72,6 +72,8 @@ try{
$preview->setScalingUp($scalingUp);
$preview->showPreview();
+} catch (\OC\PreviewNotAvailableException $e) {
+ \OC_Response::setStatus(404);
}catch(\Exception $e) {
\OC_Response::setStatus(500);
\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);