diff options
| author | David Rothstein <drothstein@gmail.com> | 2014-04-16 17:48:42 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2014-04-16 17:48:42 -0400 |
| commit | 36ed5e2ef54b74bd36f9b9a1e5830dba032a82e6 (patch) | |
| tree | 3f46eaaf5786b17e9416c939f803581be9edc57d /modules/file | |
| parent | 95614ce35deb112da18f1f8841632b718be816c7 (diff) | |
| parent | 6642fbc7001c728e218170fd286e6b8a24eef24f (diff) | |
| download | brdo-36ed5e2ef54b74bd36f9b9a1e5830dba032a82e6.tar.gz brdo-36ed5e2ef54b74bd36f9b9a1e5830dba032a82e6.tar.bz2 | |
Merge tag '7.27' into 7.x
7.27 release
Conflicts:
CHANGELOG.txt
includes/bootstrap.inc
Diffstat (limited to 'modules/file')
| -rw-r--r-- | modules/file/file.module | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/file/file.module b/modules/file/file.module index 3d351fa2c..5a635fd75 100644 --- a/modules/file/file.module +++ b/modules/file/file.module @@ -246,7 +246,7 @@ function file_ajax_upload() { return array('#type' => 'ajax', '#commands' => $commands); } - list($form, $form_state) = ajax_get_form(); + list($form, $form_state, $form_id, $form_build_id, $commands) = ajax_get_form(); if (!$form) { // Invalid form_build_id. @@ -284,7 +284,6 @@ function file_ajax_upload() { $js = drupal_add_js(); $settings = call_user_func_array('array_merge_recursive', $js['settings']['data']); - $commands = array(); $commands[] = ajax_command_replace(NULL, $output, $settings); return array('#type' => 'ajax', '#commands' => $commands); } |