Index: image.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.install,v
retrieving revision 1.25
diff -u -p -r1.25 image.install
--- image.install	17 May 2009 02:17:47 -0000	1.25
+++ image.install	22 Jun 2009 15:25:13 -0000
@@ -334,3 +334,17 @@ function image_update_6102() {
   return $ret;
 }
 
+/**
+ * Rename permission "edit images" to "edit any images".
+ */
+function image_gallery_update_6103() {
+  $ret = array();
+  $result = db_query("SELECT rid, perm FROM {permission} ORDER BY rid");
+  while ($role = db_fetch_object($result)) {
+    $renamed_permission = strtr($role->perm, 'edit images', 'edit any images');
+    if ($renamed_permission != $role->perm) {
+      $ret[] = update_sql("UPDATE {permission} SET perm = '$renamed_permission' WHERE rid = $role->rid");
+    }
+  }
+  return $ret;
+}
Index: image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.module,v
retrieving revision 1.305
diff -u -p -r1.305 image.module
--- image.module	22 May 2009 19:32:29 -0000	1.305
+++ image.module	22 Jun 2009 15:26:31 -0000
@@ -81,7 +81,7 @@ function image_node_info() {
  * Implementation of hook_perm
  */
 function image_perm() {
-  return array('create images', 'view original images', 'edit own images', 'edit images');
+  return array('create images', 'delete own images', 'delete any images', 'edit own images', 'edit any images', 'view original images');
 }
 
 /**
@@ -92,14 +92,22 @@ function image_access($op, $node, $accou
     return TRUE;
   }
 
-  if ($op == 'update' || $op == 'delete') {
-    if (user_access('edit images', $account)) {
+  if ($op == 'update') {
+    if (user_access('edit any images', $account)) {
       return TRUE;
     }
     if (user_access('edit own images', $account) && ($account->uid == $node->uid)) {
       return TRUE;
     }
   }
+  if ($op == 'delete') {
+    if (user_access('delete any images', $account)) {
+      return TRUE;
+    }
+    if (user_access('delete own images', $account) && ($account->uid == $node->uid)) {
+      return TRUE;
+    }
+  }   
 }
 
 /**
