#552520 by merlinofchaos: Fixed AJAX wrappers on poll/upload modules.

includes/ajax.inc

@@ -363,7 +363,7 @@ function ajax_command_alert($text) {
 /**
  * Creates a Drupal AJAX 'insert/replaceWith' command.
  *
- * The 'insert/replace' command instructs the client to use jQuery's
+ * The 'insert/replaceWith' command instructs the client to use jQuery's
  * replaceWith() method to replace each element matched matched by the given
  * selector with the given HTML.
  *

modules/poll/poll.module

@@ -378,8 +378,6 @@ function _poll_choice_form($key, $chid = NULL, $value = '', $votes = 0, $weight
 function poll_choice_js($form, $form_state) {
   $choice_form = $form['choice_wrapper']['choice'];
 
-  // Prevent duplicate wrappers.
-  unset($choice_form['#prefix'], $choice_form['#suffix']);
   return theme('status_messages') . drupal_render($choice_form);
 }
 

modules/upload/upload.module

@@ -236,10 +236,7 @@ function upload_form_alter(&$form, $form_state, $form_id) {
       );
 
       // Wrapper for fieldset contents (used by ajax.js).
-      $form['attachments']['wrapper'] = array(
-        '#prefix' => '<div id="attach-wrapper">',
-        '#suffix' => '</div>',
-      );
+      $form['attachments']['wrapper'] = array();
 
       // Make sure necessary directories for upload.module exist and are
       // writable before displaying the attachment form.
@@ -533,6 +530,8 @@ function _upload_form($node) {
   $form = array(
     '#theme' => 'upload_form_new',
     '#cache' => TRUE,
+    '#prefix' => '<div id="attach-wrapper">',
+    '#suffix' => '</div>',
   );
 
   if (!empty($node->files) && is_array($node->files)) {