diff options
| -rw-r--r-- | includes/theme.inc | 4 | ||||
| -rw-r--r-- | modules/comment/comment.module | 2 | ||||
| -rw-r--r-- | modules/node/node.api.php | 2 | ||||
| -rw-r--r-- | themes/pushbutton/node.tpl.php | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 2d6b88964..b934462d6 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1983,7 +1983,7 @@ function template_preprocess_node(&$variables) { $variables['name'] = theme('username', $node); $variables['node_url'] = url('node/' . $node->nid); $variables['title'] = check_plain($node->title); - $variables['page'] = (bool)menu_get_object(); + $variables['page'] = (bool)menu_get_object(); if ($node->build_mode == NODE_BUILD_PREVIEW) { unset($node->content['links']); @@ -1996,7 +1996,7 @@ function template_preprocess_node(&$variables) { $variables['links'] = !empty($node->content['links']) ? drupal_render($node->content['links']) : ''; // Render any comments. - $variables['comments'] = !empty($node->content['comments']) ? drupal_render($node->content['comments']) : ''; + $variables['comments'] = !empty($node->content['comments']) ? drupal_render($node->content['comments']) : ''; // Render the rest of the node into $content. if (!empty($node->content['teaser'])) { diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 44f648ca3..04ddc9d2d 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -495,7 +495,7 @@ function comment_nodeapi_view($node, $teaser) { ); // Append the list of comments to $node->content for node detail pages. - if ($node->comment && (bool)menu_get_object()) { + if ($node->comment && (bool)menu_get_object() && $node->build_mode != NODE_BUILD_PREVIEW) { $node->content['comments'] = array( '#markup' => comment_render($node), ); diff --git a/modules/node/node.api.php b/modules/node/node.api.php index e6a406a04..b90e65d10 100644 --- a/modules/node/node.api.php +++ b/modules/node/node.api.php @@ -366,7 +366,7 @@ function hook_nodeapi_update_index($node) { } /** - * The user has finished editing the node and is trying to preview or submit it. + * The user has finished editing the node and is previewing or submitting it. * * This hook can be used to check the node data. Errors should be set with * form_set_error(). diff --git a/themes/pushbutton/node.tpl.php b/themes/pushbutton/node.tpl.php index eac32a197..1d1a41082 100644 --- a/themes/pushbutton/node.tpl.php +++ b/themes/pushbutton/node.tpl.php @@ -10,9 +10,9 @@ <div class="taxonomy"><?php print $terms ?></div> <div class="content"><?php print $content ?></div> <?php if ($links): ?> - <div class="links">» <?php print $links ?></div> + <div class="links">» <?php print $links ?></div> + <?php endif; ?> <?php print $comments; ?> - <?php endif; ?> </div> |