- Renamed _node() to _node_info()! We reserve _node for _nodeapi.

modules/blog.module

@@ -7,9 +7,9 @@
  */
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function blog_node() {
+function blog_node_info() {
   return array('blog' => array('name' => t('personal blog entry'), 'base' => 'blog'));
 }
 

modules/blog/blog.module

@@ -7,9 +7,9 @@
  */
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function blog_node() {
+function blog_node_info() {
   return array('blog' => array('name' => t('personal blog entry'), 'base' => 'blog'));
 }
 

modules/book.module

@@ -7,9 +7,9 @@
  */
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function book_node() {
+function book_node_info() {
   return array('book' => array('name' => t('book page'), 'base' => 'book'));
 }
 

modules/book/book.module

@@ -7,9 +7,9 @@
  */
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function book_node() {
+function book_node_info() {
   return array('book' => array('name' => t('book page'), 'base' => 'book'));
 }
 

modules/forum.module

@@ -27,9 +27,9 @@ function forum_help($section) {
 }
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function forum_node() {
+function forum_node_info() {
   return array('forum' => array('name' => t('forum topic'), 'base' => 'forum'));
 }
 

modules/forum/forum.module

@@ -27,9 +27,9 @@ function forum_help($section) {
 }
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function forum_node() {
+function forum_node_info() {
   return array('forum' => array('name' => t('forum topic'), 'base' => 'forum'));
 }
 

modules/node.module

@@ -206,7 +206,7 @@ function _node_names($op = '', $node = NULL) {
   static $node_names, $node_list;
 
   if (!isset($node_names)) {
-    $node_names = module_invoke_all('node');
+    $node_names = module_invoke_all('node_info');
     foreach ($node_names as $type => $value) {
       $node_list[$type] = $value['name'];
     }

modules/node/node.module

@@ -206,7 +206,7 @@ function _node_names($op = '', $node = NULL) {
   static $node_names, $node_list;
 
   if (!isset($node_names)) {
-    $node_names = module_invoke_all('node');
+    $node_names = module_invoke_all('node_info');
     foreach ($node_names as $type => $value) {
       $node_list[$type] = $value['name'];
     }

modules/page.module

@@ -26,9 +26,9 @@ function page_perm() {
 }
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function page_node() {
+function page_node_info() {
   return array('page' => array('name' => t('page'), 'base' => 'page'));
 }
 

modules/page/page.module

@@ -26,9 +26,9 @@ function page_perm() {
 }
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function page_node() {
+function page_node_info() {
   return array('page' => array('name' => t('page'), 'base' => 'page'));
 }
 

modules/poll.module

@@ -258,9 +258,9 @@ function poll_load($node) {
 }
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function poll_node() {
+function poll_node_info() {
   return array('poll' => array('name' => t("poll"), 'base' => 'poll'));
 }
 

modules/poll/poll.module

@@ -258,9 +258,9 @@ function poll_load($node) {
 }
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function poll_node() {
+function poll_node_info() {
   return array('poll' => array('name' => t("poll"), 'base' => 'poll'));
 }
 

modules/story.module

@@ -19,9 +19,9 @@ function story_help($section) {
 }
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function story_node() {
+function story_node_info() {
   return array('story' => array('name' => t('story'), 'base' => 'story'));
 }
 

modules/story/story.module

@@ -19,9 +19,9 @@ function story_help($section) {
 }
 
 /**
- * Implementation of hook_node().
+ * Implementation of hook_node_info().
  */
-function story_node() {
+function story_node_info() {
   return array('story' => array('name' => t('story'), 'base' => 'story'));
 }