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

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

10 files changed, 6 insertions, 72 deletions

diff --git a/modules/blog.module b/modules/blog.module
index 50db6cb7a..805e458e1 100644
--- a/modules/blog.module
+++ b/modules/blog.module
@@ -222,13 +222,6 @@ function blog_form(&$node) {
 }
 
 /**
- * Implementation of hook_content().
- */
-function blog_content($node, $teaser = FALSE) {
-  return node_prepare($node, $teaser);
-}
-
-/**
  * Implementation of hook_view().
  */
 function blog_view(&$node, $teaser = FALSE, $page = FALSE) {
@@ -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);;
 }
 
 /**
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 50db6cb7a..805e458e1 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -222,13 +222,6 @@ function blog_form(&$node) {
 }
 
 /**
- * Implementation of hook_content().
- */
-function blog_content($node, $teaser = FALSE) {
-  return node_prepare($node, $teaser);
-}
-
-/**
  * Implementation of hook_view().
  */
 function blog_view(&$node, $teaser = FALSE, $page = FALSE) {
@@ -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);;
 }
 
 /**
diff --git a/modules/book.module b/modules/book.module
index 65bec14f6..ec0b20852 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -388,9 +388,6 @@ function book_next($node) {
   }
 }
 
-/**
- * Implementation of hook_content().
- */
 function book_content($node, $teaser = FALSE) {
   $op = $_POST['op'];
 
diff --git a/modules/book/book.module b/modules/book/book.module
index 65bec14f6..ec0b20852 100644
--- a/modules/book/book.module
+++ b/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'];
 
diff --git a/modules/forum.module b/modules/forum.module
index a6e8a02d0..897e90f1e 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -201,13 +201,6 @@ function forum_menu($may_cache) {
 }
 
 /**
- * Implementation of hook_content().
- */
-function forum_content($node, $teaser = FALSE) {
-  return node_prepare($node, $teaser);
-}
-
-/**
  * Implementation of hook_view().
  */
 function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
@@ -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);
 }
 
 /**
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index a6e8a02d0..897e90f1e 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -201,13 +201,6 @@ function forum_menu($may_cache) {
 }
 
 /**
- * Implementation of hook_content().
- */
-function forum_content($node, $teaser = FALSE) {
-  return node_prepare($node, $teaser);
-}
-
-/**
  * Implementation of hook_view().
  */
 function forum_view(&$node, $teaser = FALSE, $page = FALSE) {
@@ -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);
 }
 
 /**
diff --git a/modules/page.module b/modules/page.module
index 7f0a797e9..96646362f 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -99,19 +99,10 @@ function page_menu($may_cache) {
 }
 
 /**
- * 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);
 }
 
 /**
diff --git a/modules/page/page.module b/modules/page/page.module
index 7f0a797e9..96646362f 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -99,19 +99,10 @@ function page_menu($may_cache) {
 }
 
 /**
- * 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);
 }
 
 /**
diff --git a/modules/story.module b/modules/story.module
index 0448c9d2d..1e8826985 100644
--- a/modules/story.module
+++ b/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);
-}
 ?>
diff --git a/modules/story/story.module b/modules/story/story.module
index 0448c9d2d..1e8826985 100644
--- a/modules/story/story.module
+++ b/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);
-}
 ?>