? 102987-validation-for-gd.patch
? 102987-validatrio
? 193960-log-missing-field.patch
? 242945-blogapi-enable-freetagging-rev2.patch
? 242945-blogapi-enable-freetagging.patch
? 534092-cache-returns-expired-objects-rev4.patch
? modules/search/search.module-test
Index: modules/system/image.gd.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/image.gd.inc,v
retrieving revision 1.7
diff -u -p -r1.7 image.gd.inc
--- modules/system/image.gd.inc	21 Jul 2009 00:07:41 -0000	1.7
+++ modules/system/image.gd.inc	3 Aug 2009 21:28:17 -0000
@@ -16,7 +16,6 @@
  */
 function image_gd_settings() {
   if (image_gd_check_settings()) {
-    $form = array();
     $form['status'] = array(
       '#markup' => t('The GD toolkit is installed and working properly.')
     );
@@ -35,11 +34,20 @@ function image_gd_settings() {
     return $form;
   }
   else {
-    form_set_error('image_toolkit', t('The 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;
+    $form['#after_build'] = array('_image_gd_settings_missing');
   }
+  return $form;
 }
 
+function _image_gd_settings_missing($form, $form_state) {
+  // Don't report errors if another toolkit is being selected.
+  if (!isset($form['#post']['image_toolkit']) || $form['#post']['image_toolkit'] == 'gd') {
+    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 $form;
+}
+
+
 /**
  * Validate the submitted GD settings.
  */