Index: cck/content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/content.module,v
retrieving revision 1.70
diff -u -F^f -r1.70 content.module
--- cck/content.module	11 Aug 2006 13:53:05 -0000	1.70
+++ cck/content.module	15 Aug 2006 13:00:32 -0000
@@ -39,6 +39,7 @@ function content_perm() {
   foreach (content_types() as $name => $type) {
     $perms[] = 'create '. $name .' content';
     $perms[] = 'edit own '. $name .' content';
+    $perms[] = 'edit all '. $name .' content';
   }
   return $perms;
 }
@@ -199,7 +200,8 @@ function content_access($op, $node) {
   }
 
   if ($op == 'update' || $op == 'delete') {
-    if (user_access('edit own '. $type .' content') && ($user->uid == $node->uid)) {
+    if (user_access('edit own '. $type .' content') && ($user->uid == $node->uid) ||
+        user_access('edit all '. $type .' content')) {
       return TRUE;
     }
   }