- Patch #372743 by bjaspan, yched, KarenS, catch et al: node body and teasers as fields. Oh, my.

2 files changed, 3 insertions, 9 deletions

diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index d4e1171b1..900e0930a 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -73,12 +73,7 @@ function blog_help($path, $arg) {
  * Implement hook_form().
  */
 function blog_form($node, $form_state) {
-  global $nid;
-  $type = node_type_get_type($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_field'] = node_body_field($node, $type->body_label, $type->min_word_count);
-  return $form;
+  return node_content_form($node, $form_state);
 }
 
 /**
@@ -89,8 +84,7 @@ function blog_view($node, $teaser) {
     // Breadcrumb navigation.
     drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("!name's blog", array('!name' => $node->name)), 'blog/' . $node->uid)));
   }
-
-  return node_prepare($node, $teaser);
+  return $node;
 }
 
 /**
diff --git a/modules/blog/blog.test b/modules/blog/blog.test
index 8b231d878..a59a63cf7 100644
--- a/modules/blog/blog.test
+++ b/modules/blog/blog.test
@@ -154,7 +154,7 @@ class BlogTestCase extends DrupalWebTestCase {
       // Edit blog node.
       $edit = array();
       $edit['title'] = 'node/' . $node->nid;
-      $edit['body'] = $this->randomName(256);
+      $edit['body[0][value]'] = $this->randomName(256);
       $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
       $this->assertRaw(t('Blog entry %title has been updated.', array('%title' => $edit['title'])), t('Blog node was edited'));