From dbead89c1fd190b0ca40cc280384d4f1cff8b0b4 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Mon, 4 Oct 2004 20:34:23 +0000
Subject: [PATCH] Part of #11280: node_preview() should only generate a teaser
if none is present (e.g. provided by a module like excerpt.module).
---
modules/node.module | 7 +++++--
modules/node/node.module | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/modules/node.module b/modules/node.module
index c3812f963ab8..7a54a8ee7155 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 c3812f963ab8..7a54a8ee7155 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) {
--
GitLab