From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 5 Feb 2019 16:28:30 +0000 (-0500)
Subject: Update script to check for error from Imagick
X-Git-Tag: v2.11.0^2~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=09e82999cb48744b30fcad68d172881447b1d899;p=WP-Plugins%2Fglm-member-db.git

Update script to check for error from Imagick

use try catch to catch errors that are thrown.
---

diff --git a/models/admin/ajax/imageUpload.php b/models/admin/ajax/imageUpload.php
index 5dc1a63f..7e365346 100644
--- a/models/admin/ajax/imageUpload.php
+++ b/models/admin/ajax/imageUpload.php
@@ -320,10 +320,14 @@ class GlmMembersAdmin_ajax_imageUpload extends GlmDataImages
     public function stripImageMeta($imageName) {
 
         if (extension_loaded('imagick')) {
-            $imagick = new Imagick($imageName);
-            $imagick->setCompressionQuality(100);
-            $imagick->stripImage();
-            $imagick->writeImage($imageName);
+            try {
+                $imagick = new Imagick($imageName);
+                $imagick->setCompressionQuality(100);
+                $imagick->stripImage();
+                $imagick->writeImage($imageName);
+            } catch ( ImagickException $e ) {
+                return $imageName;
+            }
         } else if (extension_loaded('gd') && function_exists('gd_info')) {
             $image_type = exif_imagetype($imageName);
             $newImageQuality = 100;