Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.473
diff -u -r1.473 forum.module
--- modules/forum/forum.module	11 Nov 2008 16:49:37 -0000	1.473
+++ modules/forum/forum.module	4 Dec 2008 05:29:27 -0000
@@ -183,7 +183,7 @@
 /**
  * Implementation of hook_nodeapi_view().
  */
-function forum_nodeapi_view(&$node, $teaser, $page) {
+function forum_nodeapi_view($node, $teaser, $page) {
   $vid = variable_get('forum_nav_vocabulary', '');
   $vocabulary = taxonomy_vocabulary_load($vid);
   if (_forum_nodeapi_check_node_type($node, $vocabulary)) {
@@ -221,7 +221,7 @@
 /**
  * Implementation of hook_nodeapi_prepare().
  */
-function forum_nodeapi_prepare(&$node, $teaser, $page) {
+function forum_nodeapi_prepare($node) {
   $vid = variable_get('forum_nav_vocabulary', '');
   $vocabulary = taxonomy_vocabulary_load($vid);
   if (_forum_nodeapi_check_node_type($node, $vocabulary)) {
@@ -238,7 +238,7 @@
  *
  * Check in particular that only a "leaf" term in the associated taxonomy.
  */
-function forum_nodeapi_validate(&$node, $teaser, $page) {
+function forum_nodeapi_validate($node, $form) {
   $vid = variable_get('forum_nav_vocabulary', '');
   $vocabulary = taxonomy_vocabulary_load($vid);
   if (_forum_nodeapi_check_node_type($node, $vocabulary)) {
@@ -264,7 +264,7 @@
  *
  * Assign forum taxonomy when adding a topic from within a forum.
  */
-function forum_nodeapi_presave(&$node, $teaser, $page) {
+function forum_nodeapi_presave($node) {
   $vid = variable_get('forum_nav_vocabulary', '');
   $vocabulary = taxonomy_vocabulary_load($vid);
   if (_forum_nodeapi_check_node_type($node, $vocabulary)) {
@@ -293,7 +293,7 @@
 /**
  * Implementation of hook_nodeapi_update().
  */
-function forum_nodeapi_update(&$node, $teaser, $page) {
+function forum_nodeapi_update($node) {
   $vid = variable_get('forum_nav_vocabulary', '');
   $vocabulary = taxonomy_vocabulary_load($vid);
   if (_forum_nodeapi_check_node_type($node, $vocabulary)) {
@@ -317,7 +317,7 @@
 /**
  * Implementation of hook_nodeapi_insert().
  */
-function forum_nodeapi_insert(&$node, $teaser, $page) {
+function forum_nodeapi_insert($node) {
   $vid = variable_get('forum_nav_vocabulary', '');
   $vocabulary = taxonomy_vocabulary_load($vid);
   if (_forum_nodeapi_check_node_type($node, $vocabulary)) {
@@ -330,7 +330,7 @@
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function forum_nodeapi_delete(&$node, $teaser, $page) {
+function forum_nodeapi_delete($node) {
   $vid = variable_get('forum_nav_vocabulary', '');
   $vocabulary = taxonomy_vocabulary_load($vid);
   if (_forum_nodeapi_check_node_type($node, $vocabulary)) {
@@ -341,7 +341,7 @@
 /**
  * Implementation of hook_nodeapi_load().
  */
-function forum_nodeapi_load(&$node, $teaser, $page) {
+function forum_nodeapi_load($node) {
   $vid = variable_get('forum_nav_vocabulary', '');
   $vocabulary = taxonomy_vocabulary_load($vid);
   if (_forum_nodeapi_check_node_type($node, $vocabulary)) {
@@ -511,7 +511,7 @@
 /**
  * Implementation of hook_form().
  */
-function forum_form(&$node, $form_state) {
+function forum_form($node, $form_state) {
   $type = node_get_types('type', $node);
   $form['title'] = array('#type' => 'textfield', '#title' => check_plain($type->title_label), '#default_value' => !empty($node->title) ? $node->title : '', '#required' => TRUE, '#weight' => -5);
 
Index: modules/blog/blog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v
retrieving revision 1.312
diff -u -r1.312 blog.module
--- modules/blog/blog.module	1 Nov 2008 18:23:12 -0000	1.312
+++ modules/blog/blog.module	4 Dec 2008 05:29:25 -0000
@@ -72,7 +72,7 @@
 /**
  * Implementation of hook_form().
  */
-function blog_form(&$node) {
+function blog_form($node, $form_state) {
   global $nid;
   $type = node_get_types('type', $node);
 
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.287
diff -u -r1.287 statistics.module
--- modules/statistics/statistics.module	2 Dec 2008 21:24:34 -0000	1.287
+++ modules/statistics/statistics.module	4 Dec 2008 05:29:31 -0000
@@ -325,7 +325,7 @@
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function statistics_nodeapi_delete(&$node, $arg = 0) {
+function statistics_nodeapi_delete($node) {
   // clean up statistics table when node is deleted
   db_query('DELETE FROM {node_counter} WHERE nid = %d', $node->nid);
 }
Index: modules/trigger/trigger.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.module,v
retrieving revision 1.22
diff -u -r1.22 trigger.module
--- modules/trigger/trigger.module	11 Nov 2008 16:49:38 -0000	1.22
+++ modules/trigger/trigger.module	4 Dec 2008 05:29:33 -0000
@@ -204,7 +204,7 @@
  *
  * @TODO: Take advantage of the new API and reorganise/remove this function.
  */
-function _trigger_nodeapi(&$node, $op, $a3, $a4) {
+function _trigger_nodeapi($node, $op, $a3 = NULL, $a4 = NULL) {
   // Keep objects for reuse so that changes actions make to objects can persist.
   static $objects;
   // Prevent recursion by tracking which operations have already been called.
@@ -245,36 +245,36 @@
 /**
  * Implementation of hook_nodeapi_view().
  */
-function trigger_nodeapi_view(&$node, $a3, $a4) {
-  _trigger_nodeapi($node, 'view', $a3, $a4);
+function trigger_nodeapi_view($node, $teaser, $page) {
+  _trigger_nodeapi($node, 'view', $teaser, $page);
 }
 
 /**
  * Implementation of hook_nodeapi_update().
  */
-function trigger_nodeapi_update(&$node, $a3, $a4) {
-  _trigger_nodeapi($node, 'update', $a3, $a4);
+function trigger_nodeapi_update($node) {
+  _trigger_nodeapi($node, 'update');
 }
 
 /**
  * Implementation of hook_nodeapi_presave().
  */
-function trigger_nodeapi_presave(&$node, $a3, $a4) {
-  _trigger_nodeapi($node, 'presave', $a3, $a4);
+function trigger_nodeapi_presave($node) {
+  _trigger_nodeapi($node, 'presave');
 }
 
 /**
  * Implementation of hook_nodeapi_insert().
  */
-function trigger_nodeapi_insert(&$node, $a3, $a4) {
-  _trigger_nodeapi($node, 'insert', $a3, $a4);
+function trigger_nodeapi_insert($node) {
+  _trigger_nodeapi($node, 'insert');
 }
 
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function trigger_nodeapi_delete(&$node, $a3, $a4) {
-  _trigger_nodeapi($node, 'delete', $a3, $a4);
+function trigger_nodeapi_delete($node) {
+  _trigger_nodeapi($node, 'delete');
 }
 
 /**
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.668
diff -u -r1.668 comment.module
--- modules/comment/comment.module	3 Dec 2008 16:32:21 -0000	1.668
+++ modules/comment/comment.module	4 Dec 2008 05:29:27 -0000
@@ -579,7 +579,7 @@
 /**
  * Implementation of hook_nodeapi_load().
  */
-function comment_nodeapi_load(&$node, $arg = 0) {
+function comment_nodeapi_load($node) {
   if ($node->comment != COMMENT_NODE_DISABLED) {
     return db_query('SELECT last_comment_timestamp, last_comment_name, comment_count FROM {node_comment_statistics} WHERE nid = :nid', array(':nid' => $node->nid))->fetchAssoc();
   }
@@ -589,7 +589,7 @@
 /**
  * Implementation of hook_nodeapi_prepare().
  */
-function comment_nodeapi_prepare(&$node, $arg = 0) {
+function comment_nodeapi_prepare($node) {
   if (!isset($node->comment)) {
     $node->comment = variable_get("comment_$node->type", COMMENT_NODE_READ_WRITE);
   }
@@ -598,7 +598,7 @@
 /**
  * Implementation of hook_nodeapi_insert().
  */
-function comment_nodeapi_insert(&$node, $arg = 0) {
+function comment_nodeapi_insert($node) {
   db_insert('node_comment_statistics')
     ->fields(array(
       'nid' => $node->nid,
@@ -612,7 +612,7 @@
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function comment_nodeapi_delete(&$node, $arg = 0) {
+function comment_nodeapi_delete($node) {
   db_delete('comment')
     ->condition('nid', $node->nid)
     ->execute();
@@ -624,7 +624,7 @@
 /**
  * Implementation of hook_nodeapi_update_index().
  */
-function comment_nodeapi_update_index(&$node, $arg = 0) {
+function comment_nodeapi_update_index($node) {
   $text = '';
   $comments = db_query('SELECT subject, comment, format FROM {comment} WHERE nid = :nid AND status = :status', array(':nid' => $node->nid, ':status' => COMMENT_PUBLISHED));
   foreach ($comments as $comment) {
@@ -636,7 +636,7 @@
 /**
  * Implementation of hook_nodeapi_search_result().
  */
-function comment_nodeapi_search_result(&$node, $arg = 0) {
+function comment_nodeapi_search_result($node) {
   $comments = db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid', array('nid' => $node->nid))->fetchField();
   return format_plural($comments, '1 comment', '@count comments');
 }
@@ -644,7 +644,7 @@
 /**
  * Implementation of hook_nodeapi_rss_item().
  */
-function comment_nodeapi_rss_item(&$node, $arg = 0) {
+function comment_nodeapi_rss_item($node) {
   if ($node->comment != COMMENT_NODE_DISABLED) {
     return array(array('key' => 'comments', 'value' => url('node/' . $node->nid, array('fragment' => 'comments', 'absolute' => TRUE))));
   }
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.277
diff -u -r1.277 poll.module
--- modules/poll/poll.module	12 Oct 2008 04:30:07 -0000	1.277
+++ modules/poll/poll.module	4 Dec 2008 05:29:30 -0000
@@ -194,7 +194,7 @@
 /**
  * Implementation of hook_form().
  */
-function poll_form(&$node, $form_state) {
+function poll_form($node, $form_state) {
   global $user;
 
   $admin = user_access('administer nodes') || user_access('edit any poll content') || (user_access('edit own poll content') && $user->uid == $node->uid);
@@ -427,7 +427,7 @@
 /**
  * Implementation of hook_validate().
  */
-function poll_validate($node) {
+function poll_validate($node, $form) {
   if (isset($node->title)) {
     // Check for at least two options and validate amount of votes:
     $realchoices = 0;
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.277
diff -u -r1.277 search.module
--- modules/search/search.module	3 Dec 2008 16:32:22 -0000	1.277
+++ modules/search/search.module	4 Dec 2008 05:29:31 -0000
@@ -638,7 +638,7 @@
 /**
  * Implementation of hook_nodeapi_update_index().
  */
-function search_nodeapi_update_index(&$node, $teaser = NULL, $page = NULL) {
+function search_nodeapi_update_index($node) {
   // Transplant links to a node into the target node.
   $result = db_query("SELECT caption FROM {search_node_links} WHERE nid = %d", $node->nid);
   $output = array();
@@ -651,7 +651,7 @@
 /**
  * Implementation of hook_nodeapi_update().
  */
-function search_nodeapi_update(&$node, $teaser = NULL, $page = NULL) {
+function search_nodeapi_update($node) {
   // Reindex the node when it is updated.  The node is automatically indexed
   // when it is added, simply by being added to the node table.
   search_touch_node($node->nid);
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.218
diff -u -r1.218 upload.module
--- modules/upload/upload.module	24 Nov 2008 12:08:45 -0000	1.218
+++ modules/upload/upload.module	4 Dec 2008 05:29:33 -0000
@@ -300,7 +300,7 @@
 /**
  * Implementation of hook_nodeapi_load().
  */
-function upload_nodeapi_load(&$node, $teaser) {
+function upload_nodeapi_load($node) {
   if (variable_get("upload_$node->type", 1) == 1) {
     $output = array('files' => upload_load($node));
     return $output;
@@ -310,7 +310,7 @@
 /**
  * Implementation of hook_nodeapi_view().
  */
-function upload_nodeapi_view(&$node, $teaser) {
+function upload_nodeapi_view($node, $teaser, $page) {
   if (isset($node->files) && user_access('view uploaded files')) {
     // Add the attachments list to node body with a heavy
     // weight to ensure they're below other elements
@@ -328,7 +328,7 @@
 /**
  * Implementation of hook_nodeapi_insert().
  */
-function upload_nodeapi_insert(&$node, $teaser) {
+function upload_nodeapi_insert($node) {
   if (user_access('upload files')) {
     upload_save($node);
   }
@@ -337,7 +337,7 @@
 /**
  * Implementation of hook_nodeapi_update().
  */
-function upload_nodeapi_update(&$node, $teaser) {
+function upload_nodeapi_update($node) {
   if (user_access('upload files')) {
     upload_save($node);
   }
@@ -346,7 +346,7 @@
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function upload_nodeapi_delete(&$node, $teaser) {
+function upload_nodeapi_delete($node) {
   db_delete('upload')->condition('nid', $node->nid)->execute();
   if (!is_array($node->files)) {
     return;
@@ -359,7 +359,7 @@
 /**
  * Implementation of hook_nodeapi_delete_revision().
  */
-function upload_nodeapi_delete_revision(&$node, $teaser) {
+function upload_nodeapi_delete_revision($node) {
   db_delete('upload')->condition('vid', $node->vid)->execute();
   if (!is_array($node->files)) {
     return;
@@ -372,14 +372,14 @@
 /**
  * Implementation of hook_nodeapi_search_result().
  */
-function upload_nodeapi_search_result(&$node, $teaser) {
+function upload_nodeapi_search_result($node) {
   return isset($node->files) && is_array($node->files) ? format_plural(count($node->files), '1 attachment', '@count attachments') : NULL;
 }
 
 /**
  * Implementation of hook_nodeapi_rss_item().
  */
-function upload_nodeapi_rss_item(&$node, $teaser) {
+function upload_nodeapi_rss_item($node) {
   if (is_array($node->files)) {
     $files = array();
     foreach ($node->files as $file) {
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.150
diff -u -r1.150 path.module
--- modules/path/path.module	22 Nov 2008 10:49:01 -0000	1.150
+++ modules/path/path.module	4 Dec 2008 05:29:30 -0000
@@ -120,7 +120,7 @@
 /**
  * Implementation of hook_nodeapi_validate().
  */
-function path_nodeapi_validate(&$node, $arg) {
+function path_nodeapi_validate($node, $form) {
   if (user_access('create url aliases') || user_access('administer url aliases')) {
     if (isset($node->path)) {
       $language = isset($node->language) ? $node->language : '';
@@ -135,7 +135,7 @@
 /**
  * Implementation of hook_nodeapi_load().
  */
-function path_nodeapi_load(&$node, $arg) {
+function path_nodeapi_load($node) {
   $language = isset($node->language) ? $node->language : '';
   $path = 'node/' . $node->nid;
   $alias = drupal_get_path_alias($path, $language);
@@ -147,7 +147,7 @@
 /**
  * Implementation of hook_nodeapi_insert().
  */
-function path_nodeapi_insert(&$node, $arg) {
+function path_nodeapi_insert($node) {
   if (user_access('create url aliases') || user_access('administer url aliases')) {
     $language = isset($node->language) ? $node->language : '';
     // Don't try to insert if path is NULL. We may have already set
@@ -161,7 +161,7 @@
 /**
  * Implementation of hook_nodeapi_update().
  */
-function path_nodeapi_update(&$node, $arg) {
+function path_nodeapi_update($node) {
   if (user_access('create url aliases') || user_access('administer url aliases')) {
     $language = isset($node->language) ? $node->language : '';
     path_set_alias('node/' . $node->nid, isset($node->path) ? $node->path : NULL, isset($node->pid) ? $node->pid : NULL, $language);
@@ -171,7 +171,7 @@
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function path_nodeapi_delete(&$node, $arg) {
+function path_nodeapi_delete($node) {
   if (user_access('create url aliases') || user_access('administer url aliases')) {
     $language = isset($node->language) ? $node->language : '';
     $path = 'node/' . $node->nid;
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.442
diff -u -r1.442 taxonomy.module
--- modules/taxonomy/taxonomy.module	13 Nov 2008 08:13:56 -0000	1.442
+++ modules/taxonomy/taxonomy.module	4 Dec 2008 05:29:32 -0000
@@ -639,7 +639,7 @@
 /**
  * Make sure incoming vids are free tagging enabled.
  */
-function taxonomy_node_validate(&$node) {
+function taxonomy_node_validate($node, $form) {
   if (!empty($node->taxonomy)) {
     $terms = $node->taxonomy;
     if (!empty($terms['tags'])) {
@@ -1208,7 +1208,7 @@
 /**
  * Implementation of hook_nodeapi_load().
  */
-function taxonomy_nodeapi_load($node, $arg = 0) {
+function taxonomy_nodeapi_load($node) {
   $output['taxonomy'] = taxonomy_node_get_terms($node);
   return $output;
 }
@@ -1216,7 +1216,7 @@
 /**
  * Implementation of hook_nodeapi_insert().
  */
-function taxonomy_nodeapi_insert($node, $arg = 0) {
+function taxonomy_nodeapi_insert($node) {
   if (!empty($node->taxonomy)) {
     taxonomy_node_save($node, $node->taxonomy);
   }
@@ -1225,7 +1225,7 @@
 /**
  * Implementation of hook_nodeapi_update().
  */
-function taxonomy_nodeapi_update($node, $arg = 0) {
+function taxonomy_nodeapi_update($node) {
   if (!empty($node->taxonomy)) {
     taxonomy_node_save($node, $node->taxonomy);
   }
@@ -1234,35 +1234,35 @@
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function taxonomy_nodeapi_delete($node, $arg = 0) {
+function taxonomy_nodeapi_delete($node) {
   taxonomy_node_delete($node);
 }
 
 /**
  * Implementation of hook_nodeapi_delete_revision().
  */
-function taxonomy_nodeapi_delete_revision($node, $arg = 0) {
+function taxonomy_nodeapi_delete_revision($node) {
   taxonomy_node_delete_revision($node);
 }
 
 /**
  * Implementation of hook_nodeapi_validate().
  */
-function taxonomy_nodeapi_validate($node, $arg = 0) {
+function taxonomy_nodeapi_validate($node, $form) {
   taxonomy_node_validate($node);
 }
 
 /**
  * Implementation of hook_nodeapi_rss_item().
  */
-function taxonomy_nodeapi_rss_item($node, $arg = 0) {
+function taxonomy_nodeapi_rss_item($node) {
   return taxonomy_rss_item($node);
 }
 
 /**
  * Implementation of hook_nodeapi_update_index().
  */
-function taxonomy_nodeapi_update_index($node, $arg = 0) {
+function taxonomy_nodeapi_update_index($node) {
   return taxonomy_node_update_index($node);
 }
 
Index: modules/translation/translation.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/translation/translation.module,v
retrieving revision 1.34
diff -u -r1.34 translation.module
--- modules/translation/translation.module	11 Nov 2008 16:49:38 -0000	1.34
+++ modules/translation/translation.module	4 Dec 2008 05:29:33 -0000
@@ -186,7 +186,7 @@
 /**
  * Implementation of hook_nodeapi_prepare().
  */
-function translation_nodeapi_prepare(&$node, $teaser, $page) {
+function translation_nodeapi_prepare($node) {
   // Only act if we are dealing with a content type supporting translations.
   if (translation_supported_type($node->type)) {
     if (empty($node->nid) && isset($_GET['translation']) && isset($_GET['language']) &&
@@ -207,7 +207,7 @@
 /**
  * Implementation of hook_nodeapi_insert().
  */
-function translation_nodeapi_insert(&$node, $teaser, $page) {
+function translation_nodeapi_insert($node) {
   // Only act if we are dealing with a content type supporting translations.
   if (translation_supported_type($node->type)) {
     if (!empty($node->translation_source)) {
@@ -228,7 +228,7 @@
 /**
  * Implementation of hook_nodeapi_update().
  */
-function translation_nodeapi_update(&$node, $teaser, $page) {
+function translation_nodeapi_update($node) {
   // Only act if we are dealing with a content type supporting translations.
   if (translation_supported_type($node->type)) {
     if (isset($node->translation) && $node->translation && !empty($node->language) && $node->tnid) {
@@ -245,7 +245,7 @@
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function translation_nodeapi_delete(&$node, $teaser, $page) {
+function translation_nodeapi_delete($node) {
   // Only act if we are dealing with a content type supporting translations.
   if (translation_supported_type($node->type)) {
     translation_remove_from_set($node);
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.475
diff -u -r1.475 book.module
--- modules/book/book.module	16 Nov 2008 19:41:14 -0000	1.475
+++ modules/book/book.module	4 Dec 2008 05:29:25 -0000
@@ -705,7 +705,7 @@
 /**
  * Implementation of hook_nodeapi_load().
  */
-function book_nodeapi_load(&$node, $teaser, $page) {
+function book_nodeapi_load($node) {
   // Note - we cannot use book_link_load() because it will call node_load().
   $info['book'] = db_query('SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid = :nid', array(
     ':nid' => $node->nid
@@ -723,7 +723,7 @@
 /**
  * Implementation of hook_nodeapi_view().
  */
-function book_nodeapi_view(&$node, $teaser, $page) {
+function book_nodeapi_view($node, $teaser, $page) {
   if (!$teaser) {
     if (!empty($node->book['bid']) && $node->build_mode == NODE_BUILD_NORMAL) {
       $node->content['book_navigation'] = array(
@@ -742,7 +742,7 @@
 /**
  * Implementation of hook_nodeapi_presave().
  */
-function book_nodeapi_presave(&$node, $teaser, $page) {
+function book_nodeapi_presave($node) {
   // Always save a revision for non-administrators.
   if (!empty($node->book['bid']) && !user_access('administer nodes')) {
     $node->revision = 1;
@@ -756,7 +756,7 @@
 /**
  * Implementation of hook_nodeapi_insert().
  */
-function book_nodeapi_insert(&$node, $teaser, $page) {
+function book_nodeapi_insert($node) {
   if (!empty($node->book['bid'])) {
     if ($node->book['bid'] == 'new') {
       // New nodes that are their own book.
@@ -771,7 +771,7 @@
 /**
  * Implementation of hook_nodeapi_update().
  */
-function book_nodeapi_update(&$node, $teaser, $page) {
+function book_nodeapi_update($node) {
   if (!empty($node->book['bid'])) {
     if ($node->book['bid'] == 'new') {
       // New nodes that are their own book.
@@ -786,7 +786,7 @@
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function book_nodeapi_delete(&$node, $teaser, $page) {
+function book_nodeapi_delete($node) {
   if (!empty($node->book['bid'])) {
     if ($node->nid == $node->book['bid']) {
       // Handle deletion of a top-level post.
@@ -809,7 +809,7 @@
 /**
  * Implementation of hook_nodeapi_prepare().
  */
-function book_nodeapi_prepare(&$node, $teaser, $page) {
+function book_nodeapi_prepare($node) {
   // Prepare defaults for the add/edit form.
   if (empty($node->book) && (user_access('add content to books') || user_access('administer book outlines'))) {
     $node->book = array();
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.175
diff -u -r1.175 menu.module
--- modules/menu/menu.module	13 Nov 2008 05:54:35 -0000	1.175
+++ modules/menu/menu.module	4 Dec 2008 05:29:28 -0000
@@ -284,7 +284,7 @@
 /**
  * Implementation of hook_nodeapi_insert().
  */
-function menu_nodeapi_insert(&$node) {
+function menu_nodeapi_insert($node) {
   if (isset($node->menu)) {
     $item = $node->menu;
     if (!empty($item['delete'])) {
@@ -306,7 +306,7 @@
 /**
  * Implementation of hook_nodeapi_update().
  */
-function menu_nodeapi_update(&$node) {
+function menu_nodeapi_update($node) {
   if (isset($node->menu)) {
     $item = $node->menu;
     if (!empty($item['delete'])) {
@@ -328,7 +328,7 @@
 /**
  * Implementation of hook_nodeapi_delete().
  */
-function menu_nodeapi_delete(&$node) {
+function menu_nodeapi_delete($node) {
   // Delete all menu module links that point to this node.
   $result = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :path AND module = 'menu'", array(':path' => 'node/'. $node->nid));
   while ($m = db_fetch_array($result)) {
@@ -339,7 +339,7 @@
 /**
  * Implementation of hook_nodeapi_prepare().
  */
-function menu_nodeapi_prepare(&$node) {
+function menu_nodeapi_prepare($node) {
   if (empty($node->menu)) {
     // Prepare the node for the edit form so that $node->menu always exists.
     $menu_name = variable_get('menu_default_node_menu', 'main-menu');