diff options
| -rw-r--r-- | modules/node.module | 9 | ||||
| -rw-r--r-- | modules/node/node.module | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/modules/node.module b/modules/node.module index aa2f4963f..b7ec70493 100644 --- a/modules/node.module +++ b/modules/node.module @@ -160,14 +160,15 @@ function node_teaser($body) { $size = variable_get('teaser_length', 600); - // If the size is zero, teasers are disabled so we return the entire body. - if ($size == 0) { + // find where the delimiter is in the body + $delimiter = strpos($body, '<!--break-->'); + + // If the size is zero, and there is no delimiter, we return the entire body. + if ($size == 0 && $delimiter == 0) { return $body; } // If a valid delimiter has been specified, use it to chop of the teaser. - // The delimiter can be outside the allowed range by no more than a factor of two. - $delimiter = strpos($body, '<!--break-->'); if ($delimiter > 0) { return substr($body, 0, $delimiter); } diff --git a/modules/node/node.module b/modules/node/node.module index aa2f4963f..b7ec70493 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -160,14 +160,15 @@ function node_teaser($body) { $size = variable_get('teaser_length', 600); - // If the size is zero, teasers are disabled so we return the entire body. - if ($size == 0) { + // find where the delimiter is in the body + $delimiter = strpos($body, '<!--break-->'); + + // If the size is zero, and there is no delimiter, we return the entire body. + if ($size == 0 && $delimiter == 0) { return $body; } // If a valid delimiter has been specified, use it to chop of the teaser. - // The delimiter can be outside the allowed range by no more than a factor of two. - $delimiter = strpos($body, '<!--break-->'); if ($delimiter > 0) { return substr($body, 0, $delimiter); } |