diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2007-06-22 08:46:16 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2007-06-22 08:46:16 +0000 |
| commit | 569ede574f2db14d7359b42e1ccbf5772a4554fb (patch) | |
| tree | fadd967fb5610aacf078b562a29f5728f23a710d /modules/upload/upload.module | |
| parent | fe8b35f52778b63b96c969da27d2929beee8c1b9 (diff) | |
| download | brdo-569ede574f2db14d7359b42e1ccbf5772a4554fb.tar.gz brdo-569ede574f2db14d7359b42e1ccbf5772a4554fb.tar.bz2 | |
#115139: Add centralized json handler (and send text/javascript content-type header).
Diffstat (limited to 'modules/upload/upload.module')
| -rw-r--r-- | modules/upload/upload.module | 3 |
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; } |