diff options
| author | Max Kostikov <max@kostikov.co> | 2018-12-11 13:31:34 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2018-12-11 13:31:34 +0100 |
| commit | 6bea3d6bfc984e6f30867f00be5a92b5cd5be925 (patch) | |
| tree | dfa52436ec997eec5795b5dee247b3e4f6fa6557 | |
| parent | 4cb4f175004fe28cfec449932b7f3fe1a36ab8a7 (diff) | |
| parent | 993db01400be17c5e74dfa895c324a7116a4e97e (diff) | |
| download | volse-hubzilla-6bea3d6bfc984e6f30867f00be5a92b5cd5be925.tar.gz volse-hubzilla-6bea3d6bfc984e6f30867f00be5a92b5cd5be925.tar.bz2 volse-hubzilla-6bea3d6bfc984e6f30867f00be5a92b5cd5be925.zip | |
Merge branch 'fix_photo_imagick' into 'dev'
return on readImageBlob() exception
See merge request hubzilla/core!1426
| -rw-r--r-- | include/photo/photo_imagick.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php index f04c00245..cb3ad27fb 100644 --- a/include/photo/photo_imagick.php +++ b/include/photo/photo_imagick.php @@ -36,6 +36,7 @@ class photo_imagick extends photo_driver { } catch (Exception $e) { logger('imagick readImageBlob() exception:' . print_r($e,true)); + return; } /** |