From d3ff4a9bb59ea518b16e1f13af4d5bcbe9ed36c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rok=20=C5=BDlender?= Date: Mon, 14 Mar 2011 10:51:38 +0000 Subject: [PATCH] =?UTF-8?q?Issue=20#821062=20by=20Rok=20=C5=BDlender:=20Do=20not=20handle=20ImageMagick=20version=20status=20code=20return=20as=20error.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- imageapi_imagemagick.module | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/imageapi_imagemagick.module b/imageapi_imagemagick.module index 3171d0b..d541b74 100644 --- a/imageapi_imagemagick.module +++ b/imageapi_imagemagick.module @@ -221,14 +221,18 @@ function _imageapi_imagemagick_convert_exec($command_args, &$output, &$errors) { // If ImageMagick returned a non-zero code, trigger a PHP error that will // be caught by Drupal's error handler, logged to the watchdog and // eventually displayed to the user if configured to do so. - - // If $errors is empty, only report the error code. - if (empty($errors)) { - trigger_error(t('ImageMagick reported error code !code.', array('!code' => $return_code)), E_USER_ERROR); - } - // Otherwise report the error code, and the error message. - else { - trigger_error(t("ImageMagick reported error code !code.\nMessage:\n!error", array('!code' => $return_code, '!error' => $errors)), E_USER_ERROR); + if (!($command_args == '-version' && $return_code == 1)) { + // ImageMagick returns status code 1 when outputing version + // and it should not be caught as error. + + // If $errors is empty, only report the error code. + if (empty($errors)) { + trigger_error(t('ImageMagick reported error code !code.', array('!code' => $return_code)), E_USER_ERROR); + } + // Otherwise report the error code, and the error message. + else { + trigger_error(t("ImageMagick reported error code !code.\nMessage:\n!error", array('!code' => $return_code, '!error' => $errors)), E_USER_ERROR); + } } } -- 1.7.4