changeset 262:3c9ce1ad3c45

Fix gmagick/imagick checking.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 16 Dec 2018 16:53:48 +0200
parents 32c13f594e39
children 6a9e6277ef3c
files mgtool.php
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mgtool.php	Sun Dec 16 16:48:30 2018 +0200
+++ b/mgtool.php	Sun Dec 16 16:53:48 2018 +0200
@@ -52,9 +52,10 @@
 //
 function mgConvertImage($inFilename, $outFilename, $outDim, $outFormat, $outQuality, $thumb)
 {
-  if (extension_loaded("imagick") && extension_loaded("imagick"))
+  if (extension_loaded("imagick") && extension_loaded("gmagick"))
   {
-    return mgError("WARNING! Both ImageMagick AND GraphicsMagick modules enabled in PHP! This will cause problems! Refusing to work.\n");
+    mgError("FATAL ERROR! Both ImageMagick AND GraphicsMagick modules enabled in PHP! This will cause problems! Refusing to work.\n");
+    exit(1);
   }
 
   if (extension_loaded("imagick"))