1 files changed, 10 insertions, 0 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index 601260227..5f945bdb3 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -830,6 +830,16 @@ function node_save(&$node) {
     if (!isset($node->log)) {
       $node->log = '';
     }
+
+    // For the same reasons, make sure we have $node->teaser and
+    // $node->body.  We should consider making these fields nullable
+    // in a future version since node types are not required to use them.
+    if (!isset($node->teaser)) {
+      $node->teaser = '';
+    }
+    if (!isset($node->body)) {
+      $node->body = '';
+    }
   }
   elseif (!empty($node->revision)) {
     $node->old_vid = $node->vid;