summaryrefslogtreecommitdiff
path: root/modules/node
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-12-17 19:22:25 +0000
committerDries Buytaert <dries@buytaert.net>2009-12-17 19:22:25 +0000
commit58ba3b6e3f48f3f5d633dca21d28397085df3647 (patch)
tree34c61abab170a2a00e45c93a6fe5e2b0259ce056 /modules/node
parent6d1774c7dd03b2aeb21e32311a56d7fd4e1a8736 (diff)
downloadbrdo-58ba3b6e3f48f3f5d633dca21d28397085df3647.tar.gz
brdo-58ba3b6e3f48f3f5d633dca21d28397085df3647.tar.bz2
- Rollback of previous patch. Houston, it has a typo.
Diffstat (limited to 'modules/node')
-rw-r--r--modules/node/node.api.php2
-rw-r--r--modules/node/node.module13
2 files changed, 2 insertions, 13 deletions
diff --git a/modules/node/node.api.php b/modules/node/node.api.php
index 9a526c819..6553dab6f 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 (node_is_page($node)) {
+ if ((bool)menu_get_object()) {
$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 19ca4519b..a55fd039a 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1326,17 +1326,6 @@ 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
@@ -1361,7 +1350,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'] = node_is_page($node);
+ $variables['page'] = (bool)menu_get_object();
if (!empty($node->in_preview)) {
unset($node->content['links']);