#115139: Add centralized json handler (and send text/javascript content-type header).

1 files changed, 3 insertions, 0 deletions

diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 460d4726a..32e337752 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -741,7 +741,10 @@ function upload_js() {
   // @todo: Put status messages inside wrapper, instead of above so they do not
   // persist across ajax reloads.
   $output = theme('status_messages') . drupal_render($form);
+
   // We send the updated file attachments form.
+  // Don't call drupal_json(). upload.js uses an iframe and
+  // the header output by drupal_json() causes problems in some browsers.
   print drupal_to_js(array('status' => TRUE, 'data' => $output));
   exit;
 }