diff options
| -rw-r--r-- | modules/blog/blog.module | 2 | ||||
| -rw-r--r-- | modules/book/book.module | 2 | ||||
| -rw-r--r-- | modules/comment/comment.module | 2 | ||||
| -rw-r--r-- | modules/forum/forum.module | 2 | ||||
| -rw-r--r-- | modules/node/node.api.php | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 4 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/modules/blog/blog.module b/modules/blog/blog.module index b3c88e576..cbde74c6d 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, $view_mode) { - if (node_is_page($node)) { + if ($view_mode == 'full' && 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/book/book.module b/modules/book/book.module index 8ef55f4f1..7ce80cd4c 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -91,7 +91,7 @@ function book_node_view_link($node, $view_mode) { $links = array(); if (isset($node->book['depth'])) { - if ($view_mode == 'full') { + if ($view_mode == 'full' && node_is_page($node)) { $child_type = variable_get('book_child_type', 'book'); if ((user_access('add content to books') || user_access('administer book outlines')) && node_access('create', $child_type) && $node->status == 1 && $node->book['depth'] < MENU_MAX_DEPTH) { $links['book_add_child'] = array( diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 36301594d..02c0b9295 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -698,7 +698,7 @@ function comment_node_view($node, $view_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' view mode within another node. - if ($node->comment && node_is_page($node) && empty($node->in_preview) && user_access('access comments')) { + if ($node->comment && $view_mode == 'full' && 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 7d9d3e751..5b92d0d2e 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -277,7 +277,7 @@ function forum_node_view($node, $view_mode) { $vid = variable_get('forum_nav_vocabulary', 0); $vocabulary = taxonomy_vocabulary_load($vid); if (_forum_node_check_node_type($node)) { - if (node_is_page($node)) { + if ($view_mode == 'full' && 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 690fb9e39..04a626b9b 100644 --- a/modules/node/node.api.php +++ b/modules/node/node.api.php @@ -1155,7 +1155,7 @@ function hook_validate($node, &$form) { * @ingroup node_api_hooks */ function hook_view($node, $view_mode) { - if (node_is_page($node)) { + if ($view_mode == 'full' && node_is_page($node)) { $breadcrumb = array(); $breadcrumb[] = l(t('Home'), NULL); $breadcrumb[] = l(t('Example'), 'example'); diff --git a/modules/node/node.module b/modules/node/node.module index f15557028..1b646b43e 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1222,7 +1222,7 @@ function node_view($node, $view_mode = 'full') { // displayed on its own page. Modules may alter this behavior (for example, // to restrict contextual links to certain view modes) by implementing // hook_node_view_alter(). - if (!empty($node->nid) && !node_is_page($node)) { + if (!empty($node->nid) && !($view_mode == 'full' && node_is_page($node))) { $build['#contextual_links']['node'] = array('node', array($node->nid)); } @@ -1355,7 +1355,7 @@ function template_preprocess_node(&$variables) { $uri = entity_uri('node', $node); $variables['node_url'] = url($uri['path'], $uri['options']); $variables['title'] = check_plain($node->title); - $variables['page'] = node_is_page($node); + $variables['page'] = $variables['view_mode'] == 'full' && node_is_page($node); if (!empty($node->in_preview)) { unset($node->content['links']); diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 9fbc4c76f..b060a8dcb 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -637,7 +637,7 @@ function template_preprocess_taxonomy_term(&$variables) { $uri = entity_uri('taxonomy_term', $term); $variables['term_url'] = url($uri['path'], $uri['options']); $variables['term_name'] = check_plain($term->name); - $variables['page'] = taxonomy_term_is_page($term); + $variables['page'] = $variables['view_mode'] == 'full' && taxonomy_term_is_page($term); // Flatten the term object's member fields. $variables = array_merge((array) $term, $variables); |