? .cache
? .project
? .projectOptions
? files
? test.patch
? includes/image.imagemagick.inc
? misc/Thumbs.db
? misc/farbtastic/Thumbs.db
? sites/all/modules
? sites/default/settings.php
Index: includes/image.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/image.inc,v
retrieving revision 1.21
diff -u -r1.21 image.inc
--- includes/image.inc	12 May 2007 05:51:20 -0000	1.21
+++ includes/image.inc	20 Jul 2007 17:11:13 -0000
@@ -210,8 +210,8 @@
  * Retrieve settings for the GD2 toolkit.
  */
 function image_gd_settings() {
+  $form['#after_build'][] = '_image_gd_settings_validate';
   if (image_gd_check_settings()) {
-    $form = array();
     $form['status'] = array('#value' => t('The built-in GD2 toolkit is installed and working properly.'));
 
     $form['image_jpeg_quality'] = array(
@@ -223,13 +223,16 @@
       '#default_value' => variable_get('image_jpeg_quality', 75),
       '#field_suffix' => t('%'),
     );
-
-    return $form;
   }
-  else {
+  return $form;
+}
+
+function _image_gd_settings_validate($form, $form_state) {
+  // Don't report errors if another toolkit is being selected.
+  if ($form_state['values']['image_toolkit'] == 'gd' && !image_gd_check_settings()) {
     form_set_error('image_toolkit', t('The built-in GD image toolkit requires that the GD module for PHP be installed and configured properly. For more information see <a href="@url">PHP\'s image documentation</a>.', array('@url' => 'http://php.net/image')));
-    return FALSE;
   }
+  return $form;
 }
 
 /**