From 77d9ff0706304cae9f51bd2d514782ba8b488883 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 21 Sep 2009 08:54:57 +0000
Subject: - Patch #551694 by effulgentsia, rfay, sun | moshe weitzman, Dries:
 standardized the return of status messages in AJAX callbacks.

---
 modules/field/field.form.inc | 6 +-----
 modules/poll/poll.module     | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'modules')

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);
 }
 
 /**
-- 
cgit v1.2.3