Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.387
diff -u -F^f -r1.387 forum.module
--- modules/forum/forum.module	17 Mar 2007 18:30:14 -0000	1.387
+++ modules/forum/forum.module	25 Mar 2007 19:34:31 -0000
@@ -402,8 +402,7 @@ function forum_form(&$node) {
     $form['shadow'] = array('#type' => 'checkbox', '#title' => t('Leave shadow copy'), '#default_value' => $shadow, '#description' => t('If you move this topic, you can leave a link in the old forum to the new forum.'));
   }
 
-  $form['body_filter']['body'] = array('#type' => 'textarea', '#title' => check_plain($type->body_label), '#default_value' => !empty($node->body) ? $node->body : '', '#rows' => 20, '#required' => TRUE);
-  $form['body_filter']['format'] = filter_form($node->format);
+  $form = array_merge($form, node_content_form($node));
 
   return $form;
 }
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.412
diff -u -F^f -r1.412 book.module
--- modules/book/book.module	17 Mar 2007 18:30:14 -0000	1.412
+++ modules/book/book.module	25 Mar 2007 19:34:32 -0000
@@ -215,13 +215,7 @@ function book_form(&$node) {
     '#default_value' => $node->title,
     '#weight' => -5,
   );
-  $form['body_filter']['body'] = array('#type' => 'textarea',
-    '#title' => check_plain($type->body_label),
-    '#default_value' => $node->body,
-    '#rows' => 20,
-    '#required' => TRUE,
-  );
-  $form['body_filter']['format'] = filter_form($node->format);
+  $form = array_merge($form, node_content_form($node));
 
   if (user_access('administer nodes')) {
     $form['weight'] = array('#type' => 'weight',
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.276
diff -u -F^f -r1.276 blog.module
--- modules/blog/blog.module	7 Mar 2007 12:41:02 -0000	1.276
+++ modules/blog/blog.module	25 Mar 2007 19:34:32 -0000
@@ -211,8 +211,7 @@ function blog_form(&$node) {
   }
 
   $form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#required' => TRUE, '#default_value' => !empty($node->title) ? $node->title : NULL, '#weight' => -5);
-  $form['body_filter']['body'] = array('#type' => 'textarea', '#title' => check_plain($type->body_label), '#default_value' => !empty($node->body) ? $node->title : NULL, '#rows' => 20, '#required' => TRUE);
-  $form['body_filter']['filter'] = filter_form($node->format);
+  $form = array_merge($form, node_content_form($node));
   return $form;
 }