summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/node.module7
-rw-r--r--modules/node/node.module7
2 files changed, 10 insertions, 4 deletions
diff --git a/modules/node.module b/modules/node.module
index c3812f963..7a54a8ee7 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1330,8 +1330,11 @@ function node_preview($node) {
}
$node->changed = time();
- // Extract a teaser:
- $node->teaser = node_teaser($node->body);
+ // Extract a teaser, if it hasn't been set (e.g. by a module-provided
+ // 'teaser' form item).
+ if (!isset($node->teaser)) {
+ $node->teaser = node_teaser($node->body);
+ }
// Display a preview of the node:
if ($node->teaser && $node->teaser != $node->body) {
diff --git a/modules/node/node.module b/modules/node/node.module
index c3812f963..7a54a8ee7 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1330,8 +1330,11 @@ function node_preview($node) {
}
$node->changed = time();
- // Extract a teaser:
- $node->teaser = node_teaser($node->body);
+ // Extract a teaser, if it hasn't been set (e.g. by a module-provided
+ // 'teaser' form item).
+ if (!isset($node->teaser)) {
+ $node->teaser = node_teaser($node->body);
+ }
// Display a preview of the node:
if ($node->teaser && $node->teaser != $node->body) {