summaryrefslogtreecommitdiff
path: root/modules/node/node.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-08-17 16:20:08 +0000
committerDries Buytaert <dries@buytaert.net>2010-08-17 16:20:08 +0000
commita25b60541dad30baa72736a3b00c1a0267b6e1e8 (patch)
tree0821cc8020b10f15c4f1428433888976fdbdc8b9 /modules/node/node.module
parent30ecab3775b7f0fc13fd19d6d245a0f774168d9c (diff)
downloadbrdo-a25b60541dad30baa72736a3b00c1a0267b6e1e8.tar.gz
brdo-a25b60541dad30baa72736a3b00c1a0267b6e1e8.tar.bz2
- Patch #721754 by Shellingfox, lotyrin, Damien Tournoud, chx, hefox, Gábor Hojtsy, puregin: a node cannot be displayed in different view mode on its own page.
Diffstat (limited to 'modules/node/node.module')
-rw-r--r--modules/node/node.module4
1 files changed, 2 insertions, 2 deletions
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']);