merge from upsream

2018-12-15 00:40:38 +09:00
parent e8acf7e87a 79f828125d
commit 097afab9f4
10 changed files with 43 additions and 9 deletions
@@ -36,6 +36,7 @@ class photo_imagick extends photo_driver {
 		}
 		catch (Exception $e) {
 			logger('imagick readImageBlob() exception:' . print_r($e,true));
+			return;
 		}

 		/**