- Patch #658314 by bleen18, dereine: fixed variable in node.tpl.php -- take 2.

5 files changed, 16 insertions, 6 deletions

diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 216740f69..712eb9050 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -67,7 +67,7 @@ function blog_form($node, $form_state) {
  * Implements hook_view().
  */
 function blog_view($node, $build_mode) {
-  if ((bool)menu_get_object()) {
+  if (node_is_page($node)) {
     // Breadcrumb navigation.
     drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("!name's blog", array('!name' => format_username($node))), 'blog/' . $node->uid)));
   }
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index f12c8008f..89c4fa7e7 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -577,8 +577,7 @@ function comment_node_view($node, $build_mode) {
     // page. We compare $node and $page_node to ensure that comments are not
     // appended to other nodes shown on the page, for example a node_reference
     // displayed in 'full' build mode within another node.
-    $page_node = menu_get_object();
-    if ($node->comment && isset($page_node->nid) && $page_node->nid == $node->nid && empty($node->in_preview) && user_access('access comments')) {
+    if ($node->comment && node_is_page($node) && empty($node->in_preview) && user_access('access comments')) {
       $node->content['comments'] = comment_node_page_additions($node);
     }
   }
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index cc9a4605c..2ee98f936 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -239,7 +239,7 @@ function forum_node_view($node, $build_mode) {
   $vid = variable_get('forum_nav_vocabulary', 0);
   $vocabulary = taxonomy_vocabulary_load($vid);
   if (_forum_node_check_node_type($node)) {
-    if ((bool)menu_get_object()) {
+    if (node_is_page($node)) {
       // Breadcrumb navigation
       $breadcrumb[] = l(t('Home'), NULL);
       $breadcrumb[] = l($vocabulary->name, 'forum');
diff --git a/modules/node/node.api.php b/modules/node/node.api.php
index 0ec37f42a..474398045 100644
--- a/modules/node/node.api.php
+++ b/modules/node/node.api.php
@@ -999,7 +999,7 @@ function hook_validate($node, &$form) {
  * For a detailed usage example, see node_example.module.
  */
 function hook_view($node, $build_mode = 'full') {
-  if ((bool)menu_get_object()) {
+  if (node_is_page($node)) {
     $breadcrumb = array();
     $breadcrumb[] = array('path' => 'example', 'title' => t('example'));
     $breadcrumb[] = array('path' => 'example/' . $node->field1,
diff --git a/modules/node/node.module b/modules/node/node.module
index 8eea554a6..517ba984c 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1326,6 +1326,17 @@ function node_show($node, $message = FALSE) {
 }
 
 /**
+ * Returns whether the current page is the full page view of the passed in node.
+ *
+ * @param $node
+ *   A node object.
+ */
+function node_is_page($node) {
+  $page_node = menu_get_object();
+  return (!empty($page_node) ? $page_node->nid == $node->nid : FALSE);
+}
+
+/**
  * Process variables for node.tpl.php
  *
  * Most themes utilize their own copy of node.tpl.php. The default is located
@@ -1350,7 +1361,7 @@ function template_preprocess_node(&$variables) {
   $variables['name']      = theme('username', array('account' => $node));
   $variables['node_url']  = url('node/' . $node->nid);
   $variables['node_title'] = check_plain($node->title[LANGUAGE_NONE][0]['value']);
-  $variables['page']      = (bool)menu_get_object();
+  $variables['page']      = node_is_page($node);
 
   if (!empty($node->in_preview)) {
     unset($node->content['links']);