Index: imageapi_gd.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imageapi/imageapi_gd.install,v retrieving revision 1.8 diff -u -p -r1.8 imageapi_gd.install --- imageapi_gd.install 1 Aug 2008 18:52:22 -0000 1.8 +++ imageapi_gd.install 17 Oct 2010 17:45:00 -0000 @@ -4,8 +4,8 @@ function imageapi_gd_requirements($phase) { $requirements = array(); $t = get_t(); - - $gd = function_exists('imagegd2'); + + $gd = function_exists('imagegd2') ; if (!$gd) { $requirements['imageapi_gd'] = array( @@ -15,24 +15,27 @@ function imageapi_gd_requirements($phase 'description' => $t('The GD library for PHP is missing or outdated. Please check the PHP image documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/en/image.setup.php')), ); return $requirements; - } + } // report version. $info = gd_info(); - $requirements['imageapi_gd'] = array( - 'title' => $t('GD library'), - 'value' => $info['GD Version'], - 'severity' => REQUIREMENT_OK, - ); - // Check image format support + if (!module_exists('color')) { + $requirements['imageapi_gd'] = array( + 'title' => $t('GD library'), + 'value' => $info['GD Version'], + 'severity' => REQUIREMENT_OK, + ); + } + + // Check image format support foreach (array('gif', 'jpeg', 'png') as $format) { if (function_exists('imagecreatefrom'. $format)) continue; $requirements['imageapi_gd_'. $format] = array( 'title' => $t('GD !format Support', array('!format' => drupal_ucfirst($format))), 'value' => $t('Not installed'), 'severity' => REQUIREMENT_ERROR, - 'description' => $t('PHP GD was not compiled with %format support.', array('%format' => $format)), + 'description' => $t('PHP GD was not compiled with %format support.', array('%format' => $format)), ); } @@ -58,7 +61,7 @@ function imageapi_gd_requirements($phase } $memory_limit = ini_get('memory_limit'); - + if (parse_size($memory_limit) < parse_size('96M')) { $requirements['imagecache_memory_limit'] = array( 'title' => $t('ImageAPI GD Memory Limit'),