summaryrefslogtreecommitdiff
path: root/modules/node
diff options
context:
space:
mode:
Diffstat (limited to 'modules/node')
-rw-r--r--modules/node/node.module3
-rw-r--r--modules/node/node.pages.inc6
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index 9aa9cd622..dd67cbda7 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -3600,7 +3600,8 @@ function node_unpublish_by_keyword_action_submit($form, $form_state) {
*/
function node_unpublish_by_keyword_action($node, $context) {
foreach ($context['keywords'] as $keyword) {
- if (strpos(drupal_render(node_view(clone $node)), $keyword) !== FALSE || strpos($node->title, $keyword) !== FALSE) {
+ $elements = node_view(clone $node);
+ if (strpos(drupal_render($elements), $keyword) !== FALSE || strpos($node->title, $keyword) !== FALSE) {
$node->status = NODE_NOT_PUBLISHED;
watchdog('action', 'Set @type %title to unpublished.', array('@type' => node_type_get_name($node), '%title' => $node->title));
break;
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index c1db541b7..a6d5c0a0b 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -355,8 +355,10 @@ function theme_node_preview($variables) {
$preview_trimmed_version = FALSE;
- $trimmed = drupal_render(node_view(clone $node, 'teaser'));
- $full = drupal_render(node_view($node, 'full'));
+ $elements = node_view(clone $node, 'teaser');
+ $trimmed = drupal_render($elements);
+ $elements = node_view($node, 'full');
+ $full = drupal_render($elements);
// Do we need to preview trimmed version of post as well as full version?
if ($trimmed != $full) {