- Patch #658314 by dereine, bleen18: fxed variable in node.tpl.php is buggy.

2 files changed, 13 insertions, 2 deletions

diff --git a/modules/node/node.api.php b/modules/node/node.api.php
index 6553dab6f..9a526c819 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 a55fd039a..19ca4519b 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']);