summaryrefslogtreecommitdiff
path: root/modules/file/file.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-03-13 06:55:50 +0000
committerDries Buytaert <dries@buytaert.net>2010-03-13 06:55:50 +0000
commit5e32593f3d7c1dd7412e9f918efa3121ff9e6565 (patch)
tree25896319767e65552e98f7246c89748d9297ab20 /modules/file/file.module
parent1106db64560976f8baa1e7ebaa45fd7c4917c2e1 (diff)
downloadbrdo-5e32593f3d7c1dd7412e9f918efa3121ff9e6565.tar.gz
brdo-5e32593f3d7c1dd7412e9f918efa3121ff9e6565.tar.bz2
- Patch #716602 by effulgentsia: refactor ajax_render() and clean up 'ajax' element type.
Diffstat (limited to 'modules/file/file.module')
-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 875d0abbc..49a1b94fa 100644
--- a/modules/file/file.module
+++ b/modules/file/file.module
@@ -214,7 +214,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'));
- ajax_render($commands, FALSE);
+ return array('#type' => 'ajax', '#commands' => $commands, '#header' => FALSE);
}
list($form, $form_state, $form_id, $form_build_id) = ajax_get_form();
@@ -224,7 +224,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'));
- ajax_render($commands, FALSE);
+ return array('#type' => 'ajax', '#commands' => $commands, '#header' => FALSE);
}
// Get the current element and count the number of files.
@@ -261,7 +261,7 @@ function file_ajax_upload() {
$commands = array();
$commands[] = ajax_command_replace(NULL, $output, $settings);
- ajax_render($commands, FALSE);
+ return array('#type' => 'ajax', '#commands' => $commands, '#header' => FALSE);
}
/**