Index: modules/category/category_menu/category_menu.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/category/category_menu/category_menu.module,v
retrieving revision 1.36
diff -u -r1.36 category_menu.module
--- modules/category/category_menu/category_menu.module	17 Sep 2006 14:57:02 -0000	1.36
+++ modules/category/category_menu/category_menu.module	1 Oct 2006 20:26:25 -0000
@@ -305,7 +305,7 @@
             }
           }
 
-          category_menu_delete_item($node);
+          category_menu_delete_item($node->nid);
         }
       }
     }
@@ -407,7 +407,7 @@
       // Update special case: node tagged with no categories
       $mid = category_menu_get_mapping($node->nid);
       if ($mid) {
-        category_menu_delete_item($node);
+        category_menu_delete_item($node->nid);
       }
     }
   }
@@ -473,7 +473,7 @@
           $item = menu_get_item($assigned_mid);
           if (isset($item['pid']) && $item['pid'] == $mid) {
             // Delete cases 2 and 3: category with >= 1 node
-            category_menu_delete_item($assigned_node);
+            category_menu_delete_item($assigned_node->nid);
           }
         }
       }
@@ -489,7 +489,7 @@
     }
 
     // Delete cases 2-5: category / container is being deleted
-    category_menu_delete_item($node);
+    category_menu_delete_item($node->nid);
 
     $is_cat = !empty($node->cnid);
     if (!$is_cat) {
@@ -500,7 +500,7 @@
     // Delete case 1: node tagged with >= 1 category
     $mid = category_menu_get_mapping($node->nid);
     if ($mid) {
-      category_menu_delete_item($node);
+      category_menu_delete_item($node->nid);
     }
   }
 }
@@ -574,29 +574,24 @@
 }
 
 /**
- * Delete a menu item from the database. If $item['mid'] is specified, then
- * this is used to find the existing item; otherwise, $node->nid is used to
- * form a path, which is then searched for in the menu tree.
+ * Delete the menu item associated with a node.
  *
- * @param $node
- *   The node whose menu item is to be deleted.
- * @param $mid
- *   The ID of the menu item to be deleted. If not set to default (0), is
- *   used to find the existing menu item.
+ * @param $nid
+ *   The nid of the node whose menu item is to be deleted.
  */
-function category_menu_delete_item($node) {
+function category_menu_delete_item($nid) {
   $item = array();
-  $mid = category_menu_get_mapping($node->nid);
+  $mid = category_menu_get_mapping($nid);
 
   if ($mid) {
     $item['mid'] = $mid;
   }
   else {
-    $item['path'] = 'node/'. $node->nid;
+    $item['path'] = 'node/'. $nid;
   }
 
   menu_delete_item($item);
-  category_menu_delete_mapping($node->nid);
+  category_menu_delete_mapping($nid);
 
   menu_rebuild();
 }