#216890 by gpk with documentation from myself: blog API clients do not pass on the teaser_include flag, so only act on that flag, if we have it

1 files changed, 4 insertions, 2 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index dd220267b..ef798cf0a 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -823,8 +823,10 @@ function node_submit($node) {
   if (!isset($node->teaser)) {
     if (isset($node->body)) {
       $node->teaser = node_teaser($node->body, isset($node->format) ? $node->format : NULL);
-      // Chop off the teaser from the body if needed.
-      if (empty($node->teaser_include) && $node->teaser == substr($node->body, 0, strlen($node->teaser))) {
+      // Chop off the teaser from the body if needed. The teaser_include
+      // property might not be set (eg. in Blog API postings), so only act on
+      // it, if it was set with a given value.
+      if (isset($node->teaser_include) && !$node->teaser_include && $node->teaser == substr($node->body, 0, strlen($node->teaser))) {
         $node->body = substr($node->body, strlen($node->teaser));
       }
     }