Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.112.2.10
diff -u -r1.112.2.10 form.inc
--- includes/form.inc	23 Jun 2006 08:35:51 -0000	1.112.2.10
+++ includes/form.inc	24 Jun 2006 10:35:12 -0000
@@ -60,6 +60,11 @@
  */
 function drupal_get_form($form_id, &$form, $callback = NULL) {
   global $form_values, $form_submitted, $user, $form_button_counter;
+  static $saved_globals = array();
+
+  // Save globals in case of indirect recursive call
+  array_push($saved_globals, array($form_values, $form_submitted, $form_button_counter));
+
   $form_values = array();
   $form_submitted = FALSE;
   $form_button_counter = array(0, 0);
@@ -154,7 +159,8 @@
       }
     }
   }
-
+  // Restore globals
+  list($form_values, $form_submitted, $form_button_counter) = array_pop($saved_globals);
   return form_render($form);
 }

Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.455.2.3
diff -u -r1.455.2.3 comment.module
--- modules/comment.module	8 Jun 2006 21:25:50 -0000	1.455.2.3
+++ modules/comment.module	24 Jun 2006 10:35:13 -0000
@@ -1393,7 +1393,7 @@
     $output .= theme('comment_view', $comment);
   }
   else {
-    $output .= node_view(node_load($edit['nid']));
+    $form['#suffix'] = node_view(node_load($edit['nid']));
     $edit['pid'] = 0;
   }