- Patch #11879 by Moshe: deprecated the _content hook.

  TODO:
   + Update Doxygen hook list (if required).
   + Document this in the developer's upgrade section.

modules/blog.module

@@ -221,13 +221,6 @@ function blog_form(&$node) {
   return $output;
 }
 
-/**
- * Implementation of hook_content().
- */
-function blog_content($node, $teaser = FALSE) {
-  return node_prepare($node, $teaser);
-}
-
 /**
  * Implementation of hook_view().
  */
@@ -239,8 +232,7 @@ function blog_view(&$node, $teaser = FALSE, $page = FALSE) {
     $breadcrumb[] = array('path' => 'node/'. $node->nid);
     menu_set_location($breadcrumb);
   }
-  // prepare the node content
-  $node = blog_content($node, $teaser);
+  $node = node_prepare($node, $teaser);;
 }
 
 /**

modules/blog/blog.module

@@ -221,13 +221,6 @@ function blog_form(&$node) {
   return $output;
 }
 
-/**
- * Implementation of hook_content().
- */
-function blog_content($node, $teaser = FALSE) {
-  return node_prepare($node, $teaser);
-}
-
 /**
  * Implementation of hook_view().
  */
@@ -239,8 +232,7 @@ function blog_view(&$node, $teaser = FALSE, $page = FALSE) {
     $breadcrumb[] = array('path' => 'node/'. $node->nid);
     menu_set_location($breadcrumb);
   }
-  // prepare the node content
-  $node = blog_content($node, $teaser);
+  $node = node_prepare($node, $teaser);;
 }
 
 /**

modules/book.module

@@ -388,9 +388,6 @@ function book_next($node) {
   }
 }
 
-/**
- * Implementation of hook_content().
- */
 function book_content($node, $teaser = FALSE) {
   $op = $_POST['op'];
 

modules/book/book.module

@@ -388,9 +388,6 @@ function book_next($node) {
   }
 }
 
-/**
- * Implementation of hook_content().
- */
 function book_content($node, $teaser = FALSE) {
   $op = $_POST['op'];
 

modules/forum.module

@@ -200,13 +200,6 @@ function forum_menu($may_cache) {
   return $items;
 }
 
-/**
- * Implementation of hook_content().
- */
-function forum_content($node, $teaser = FALSE) {
-  return node_prepare($node, $teaser);
-}
-
 /**
  * Implementation of hook_view().
  */
@@ -227,7 +220,7 @@ function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
     menu_set_location($breadcrumb);
   }
 
-  $node = forum_content($node, $teaser);
+  $node = node_prepare($node, $teaser);
 }
 
 /**

modules/forum/forum.module

@@ -200,13 +200,6 @@ function forum_menu($may_cache) {
   return $items;
 }
 
-/**
- * Implementation of hook_content().
- */
-function forum_content($node, $teaser = FALSE) {
-  return node_prepare($node, $teaser);
-}
-
 /**
  * Implementation of hook_view().
  */
@@ -227,7 +220,7 @@ function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
     menu_set_location($breadcrumb);
   }
 
-  $node = forum_content($node, $teaser);
+  $node = node_prepare($node, $teaser);
 }
 
 /**

modules/page.module

@@ -98,20 +98,11 @@ function page_menu($may_cache) {
   return $items;
 }
 
-/**
- * Implementation of hook_content().
- */
-function page_content($node, $teaser = FALSE) {
-  $node = node_prepare($node, $teaser);
-  return $node;
-}
-
 /**
  * Implementation of hook_view().
  */
 function page_view(&$node, $teaser = FALSE, $page = FALSE) {
-  // prepare the node content
-  $node = page_content($node, $teaser);
+  $node = node_prepare($node, $teaser);
 }
 
 /**

modules/page/page.module

@@ -98,20 +98,11 @@ function page_menu($may_cache) {
   return $items;
 }
 
-/**
- * Implementation of hook_content().
- */
-function page_content($node, $teaser = FALSE) {
-  $node = node_prepare($node, $teaser);
-  return $node;
-}
-
 /**
  * Implementation of hook_view().
  */
 function page_view(&$node, $teaser = FALSE, $page = FALSE) {
-  // prepare the node content
-  $node = page_content($node, $teaser);
+  $node = node_prepare($node, $teaser);
 }
 
 /**

modules/story.module

@@ -128,10 +128,4 @@ function story_form(&$node) {
   return $output;
 }
 
-/**
- * Implementation of hook_content().
- */
-function story_content($node, $main = 0) {
-  return node_prepare($node, $main);
-}
 ?>

modules/story/story.module

@@ -128,10 +128,4 @@ function story_form(&$node) {
   return $output;
 }
 
-/**
- * Implementation of hook_content().
- */
-function story_content($node, $main = 0) {
-  return node_prepare($node, $main);
-}
 ?>