# HG changeset patch # User Matti Hamalainen # Date 1544972028 -7200 # Node ID 3c9ce1ad3c45473fffb530c771cd97fbd99b6035 # Parent 32c13f594e39418ec45300144fed6c3ef80fcd12 Fix gmagick/imagick checking. diff -r 32c13f594e39 -r 3c9ce1ad3c45 mgtool.php --- 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"))