Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.836
diff -u -p -r1.836 node.module
--- modules/node/node.module	23 Jun 2007 13:04:29 -0000	1.836
+++ modules/node/node.module	23 Jun 2007 14:04:14 -0000
@@ -846,6 +846,7 @@ function node_perm() {
     if ($type->module == 'node') {
       $name = check_plain($type->type);
       $perms[] = 'create '. $name .' content';
+      $perms[] = 'delete '. $name .' content if edit allowed';
       $perms[] = 'edit own '. $name .' content';
       $perms[] = 'edit '. $name .' content';
     }
@@ -3082,11 +3083,17 @@ function node_content_access($op, $node)
     return user_access('create '. $type .' content');
   }
 
-  if ($op == 'update' || $op == 'delete') {
+  if ($op == 'update') {
     if (user_access('edit '. $type .' content') || (user_access('edit own '. $type .' content') && ($user->uid == $node->uid))) {
       return TRUE;
     }
   }
+  
+  if ($op == 'delete') {
+    if (user_access('delete '. $type .' content if edit allowed') && (user_access('edit '. $type .' content') || (user_access('edit own '. $type .' content') && ($user->uid == $node->uid)))) {
+      return TRUE;
+    }
+  }
 }
 
 /**