diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-09-21 08:54:57 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-09-21 08:54:57 +0000 |
| commit | 77d9ff0706304cae9f51bd2d514782ba8b488883 (patch) | |
| tree | 3b6ded3889e11e5c7a4d3fd2feee867fdb9ffb22 /modules | |
| parent | aca54cc198f64e9ef5df8bd5e75aacd1d2669c0b (diff) | |
| download | brdo-77d9ff0706304cae9f51bd2d514782ba8b488883.tar.gz brdo-77d9ff0706304cae9f51bd2d514782ba8b488883.tar.bz2 | |
- Patch #551694 by effulgentsia, rfay, sun | moshe weitzman, Dries: standardized the return of status messages in AJAX callbacks.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/field/field.form.inc | 6 | ||||
| -rw-r--r-- | modules/poll/poll.module | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index 16cd30ed9..8c2310415 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -362,9 +362,5 @@ function field_add_more_js($form, $form_state) { $field_form[$langcode][$delta]['#prefix'] = '<div class="ajax-new-content">' . (isset($field_form[$langcode][$delta]['#prefix']) ? $field_form[$langcode][$delta]['#prefix'] : ''); $field_form[$langcode][$delta]['#suffix'] = (isset($field_form[$langcode][$delta]['#suffix']) ? $field_form[$langcode][$delta]['#suffix'] : '') . '</div>'; - $output = theme('status_messages') . drupal_render($field_form); - - $commands = array(); - $commands[] = ajax_command_replace(NULL, $output); - ajax_render($commands); + return drupal_render($field_form); } diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 5a114d96f..9f4179562 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -382,7 +382,7 @@ function _poll_choice_form($key, $chid = NULL, $value = '', $votes = 0, $weight function poll_choice_js($form, $form_state) { $choice_form = $form['choice_wrapper']['choice']; - return theme('status_messages') . drupal_render($choice_form); + return drupal_render($choice_form); } /** |