Index: content.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cck/content.module,v
retrieving revision 1.24
diff -u -F^f -r1.24 content.module
--- content.module	11 Mar 2006 22:08:35 -0000	1.24
+++ content.module	18 Mar 2006 20:03:54 -0000
@@ -35,7 +35,10 @@ function content_perm() {
   $perms = array('administer content types');
   foreach (_content_types() as $name => $type) {
     $perms[] = 'create '. $name .' content';
+    $perms[] = 'view '. $name .' content';
+    $perms[] = 'edit all '. $name .' content';
     $perms[] = 'edit own '. $name .' content';
+    $perms[] = 'delete '. $name .' content';
   }
   return $perms;
 }
@@ -189,10 +192,23 @@ function content_access($op, $node) {
     return user_access('create '. $type .' content');
   }
 
-  if ($op == 'update' || $op == 'delete') {
+  if ($op == 'view') {
+    return user_access('view '. $type .' content');
+  }
+
+  if ($op == 'update') {
     if (user_access('edit own '. $type .' content') && ($user->uid == $node->uid)) {
       return TRUE;
     }
+    elseif (user_access('edit all '. $type .' content')) {
+      return TRUE;
+    }
+  }
+
+  if ($op == 'delete') {
+    if (user_access('delete '. $type .' content')) {
+      return user_access('delete '. $type .' content');
+    }
   }
 }