Merge branch 'fix_photo_imagick' into 'dev'

return on readImageBlob() exception See merge request hubzilla/core!1426
2018-12-11 13:31:34 +01:00 · 2018-12-11 13:31:34 +01:00 · 6bea3d6bfc
commit 6bea3d6bfc
parent 4cb4f17500 993db01400
1 changed files with 1 additions and 0 deletions
--- 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;
 		}

 		/**