### Eclipse Workspace Patch 1.0
#P drupal_test_7
Index: modules/field/field.form.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.form.inc,v
retrieving revision 1.2
diff -u -r1.2 field.form.inc
--- modules/field/field.form.inc	5 Feb 2009 03:42:57 -0000	1.2
+++ modules/field/field.form.inc	9 Feb 2009 23:05:39 -0000
@@ -404,6 +404,10 @@
   $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, ' . drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])) . ');</script>' : '';
 
   $output = theme('status_messages') . drupal_render($field_form) . $output_js;
-  drupal_json(array('status' => TRUE, 'data' => $output));
+
+  // drupal_json() breaks AHAH file uploads, because the jQuery
+  // Form plugin handles them in a way that is not compatible with
+  // 'text/javascript' response type.
+  print drupal_to_js(array('status' => TRUE, 'data' => $output));
   exit;
 }