summaryrefslogtreecommitdiff
path: root/modules/file
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-12-23 04:26:31 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-12-23 04:26:31 +0000
commite658064759d54e0d43872a5430ad0381366b0bcd (patch)
tree319818090c7100a0c6a7c7912a532f767d664d6f /modules/file
parentbb344c82d5c61f9259d54c247aef26f71419022a (diff)
downloadbrdo-e658064759d54e0d43872a5430ad0381366b0bcd.tar.gz
brdo-e658064759d54e0d43872a5430ad0381366b0bcd.tar.bz2
#995854 by rfay, effulgentsia, sun, merlinofchaos, Damien Tournoud, manimejia: Fixed #ajax doesn't work at all if a file element (or enctype => 'multipart/form-data') is included in the form
Diffstat (limited to 'modules/file')
-rw-r--r--modules/file/file.module6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/file/file.module b/modules/file/file.module
index 81c6000e5..bbf3a1ae4 100644
--- a/modules/file/file.module
+++ b/modules/file/file.module
@@ -237,7 +237,7 @@ function file_ajax_upload() {
drupal_set_message(t('An unrecoverable error occurred. The uploaded file likely exceeded the maximum file size (@size) that this server supports.', array('@size' => format_size(file_upload_max_size()))), 'error');
$commands = array();
$commands[] = ajax_command_replace(NULL, theme('status_messages'));
- return array('#type' => 'ajax', '#commands' => $commands, '#header' => FALSE);
+ return array('#type' => 'ajax', '#commands' => $commands);
}
list($form, $form_state) = ajax_get_form();
@@ -247,7 +247,7 @@ function file_ajax_upload() {
drupal_set_message(t('An unrecoverable error occurred. Use of this form has expired. Try reloading the page and submitting again.'), 'error');
$commands = array();
$commands[] = ajax_command_replace(NULL, theme('status_messages'));
- return array('#type' => 'ajax', '#commands' => $commands, '#header' => FALSE);
+ return array('#type' => 'ajax', '#commands' => $commands);
}
// Get the current element and count the number of files.
@@ -280,7 +280,7 @@ function file_ajax_upload() {
$commands = array();
$commands[] = ajax_command_replace(NULL, $output, $settings);
- return array('#type' => 'ajax', '#commands' => $commands, '#header' => FALSE);
+ return array('#type' => 'ajax', '#commands' => $commands);
}
/**