From 246274eb1643d3d6643cdf85559ab204491d93ac Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 29 Aug 2005 19:58:49 +0000
Subject: [PATCH] - Renamed _node() to _node_info()!  We reserve _node for
 _nodeapi.

---
 modules/blog.module        | 4 ++--
 modules/blog/blog.module   | 4 ++--
 modules/book.module        | 4 ++--
 modules/book/book.module   | 4 ++--
 modules/forum.module       | 4 ++--
 modules/forum/forum.module | 4 ++--
 modules/node.module        | 2 +-
 modules/node/node.module   | 2 +-
 modules/page.module        | 4 ++--
 modules/page/page.module   | 4 ++--
 modules/poll.module        | 4 ++--
 modules/poll/poll.module   | 4 ++--
 modules/story.module       | 4 ++--
 modules/story/story.module | 4 ++--
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/modules/blog.module b/modules/blog.module
index 3dbe76083a5..d60c1fcaabe 100644
--- a/modules/blog.module
+++ b/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'));
 }
 
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 3dbe76083a5..d60c1fcaabe 100644
--- a/modules/blog/blog.module
+++ b/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'));
 }
 
diff --git a/modules/book.module b/modules/book.module
index f65af1a58fb..73c26b1008e 100644
--- a/modules/book.module
+++ b/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'));
 }
 
diff --git a/modules/book/book.module b/modules/book/book.module
index f65af1a58fb..73c26b1008e 100644
--- a/modules/book/book.module
+++ b/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'));
 }
 
diff --git a/modules/forum.module b/modules/forum.module
index 280ab5b8447..76de2c0933d 100644
--- a/modules/forum.module
+++ b/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'));
 }
 
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 280ab5b8447..76de2c0933d 100644
--- a/modules/forum/forum.module
+++ b/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'));
 }
 
diff --git a/modules/node.module b/modules/node.module
index 4a2f1a6557a..bebeece010a 100644
--- a/modules/node.module
+++ b/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'];
     }
diff --git a/modules/node/node.module b/modules/node/node.module
index 4a2f1a6557a..bebeece010a 100644
--- a/modules/node/node.module
+++ b/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'];
     }
diff --git a/modules/page.module b/modules/page.module
index ca9c06c0ffd..38e3d66801a 100644
--- a/modules/page.module
+++ b/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'));
 }
 
diff --git a/modules/page/page.module b/modules/page/page.module
index ca9c06c0ffd..38e3d66801a 100644
--- a/modules/page/page.module
+++ b/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'));
 }
 
diff --git a/modules/poll.module b/modules/poll.module
index 4973dcf9455..129705faa4b 100644
--- a/modules/poll.module
+++ b/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'));
 }
 
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 4973dcf9455..129705faa4b 100644
--- a/modules/poll/poll.module
+++ b/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'));
 }
 
diff --git a/modules/story.module b/modules/story.module
index b4ee244c4b3..2d98f4f66d0 100644
--- a/modules/story.module
+++ b/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'));
 }
 
diff --git a/modules/story/story.module b/modules/story/story.module
index b4ee244c4b3..2d98f4f66d0 100644
--- a/modules/story/story.module
+++ b/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'));
 }