webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Merge branch 'master' into draw.io to fetch auth image changes

Browse Source
This commit is contained in:
Dan Brown
2018-01-20 14:06:44 +00:00
parent 34782fbc91 f4bfbf91db
commit 0c383eee5b
8 changed files with 67 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Repos/ImageRepo.php
View File

@ -215,7 +215,6 @@ class ImageRepo
* Get the thumbnail for an image.
* If $keepRatio is true only the width will be used.
* Checks the cache then storage to avoid creating / accessing the filesystem on every check.
*
* @param Image $image
* @param int $width
* @param int $height
@ -228,9 +227,9 @@ class ImageRepo
{
try {
return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
} catch (FileNotFoundException $exception) {
$image->delete();
return [];
} catch (\Exception $exception) {
dd($exception);
return null;
}
}