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	26 Jun 2009 12:26:03 -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, array('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	26 Jun 2009 12:31:53 -0000
@@ -81,24 +81,23 @@ 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');
 }
 
 /**
  * Implementation of hook_access().
  */
 function image_access($op, $node, $account) {
-  if ($op == 'create' && user_access('create images', $account)) {
-    return TRUE;
-  }
-
-  if ($op == 'update' || $op == 'delete') {
-    if (user_access('edit images', $account)) {
-      return TRUE;
-    }
-    if (user_access('edit own images', $account) && ($account->uid == $node->uid)) {
-      return TRUE;
-    }
+  switch ($op) {
+    case 'create':
+        return user_access('create images', $account);
+      break;
+    case 'update':
+      return (user_access('edit any images', $account) || user_access('edit own images', $account) && ($account->uid == $node->uid));
+      break;
+    case 'delete':
+      return (user_access('delete any images', $account) || user_access('delete own images', $account) && ($account->uid == $node->uid));
+      break;      
   }
 }
 
Index: contrib/image_gallery/tests/image_gallery.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/tests/image_gallery.test,v
retrieving revision 1.2
diff -u -p -r1.2 image_gallery.test
--- contrib/image_gallery/tests/image_gallery.test	22 Jun 2009 16:52:39 -0000	1.2
+++ contrib/image_gallery/tests/image_gallery.test	26 Jun 2009 12:29:04 -0000
@@ -13,7 +13,7 @@ class ImageGalleryTest extends DrupalTes
     parent::setUp();
 
     // User to create image galleries.
-    $this->web_user = $this->drupalCreateUserRolePerm(array('create images', 'view original images', 'edit own images', 'edit images', 'administer images'));
+    $this->web_user = $this->drupalCreateUserRolePerm(array('create images', 'view original images', 'edit own images', 'edit any images', 'administer image galleries'));
     $this->drupalGet('logout');
     $this->drupalLoginUser($this->web_user);
   }
Index: contrib/image_import/tests/image_import.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/tests/image_import.test,v
retrieving revision 1.2
diff -u -p -r1.2 image_import.test
--- contrib/image_import/tests/image_import.test	22 Jun 2009 16:52:40 -0000	1.2
+++ contrib/image_import/tests/image_import.test	26 Jun 2009 12:29:27 -0000
@@ -17,7 +17,7 @@ class ImageImportTest extends DrupalTest
     $this->drupalVariableSet('image_import_path', $image_import_path);
     
     // User to create image galleries.
-    $this->web_user = $this->drupalCreateUserRolePerm(array('create images', 'view original images', 'edit own images', 'edit images', 'administer images', 'import images'));
+    $this->web_user = $this->drupalCreateUserRolePerm(array('create images', 'view original images', 'edit own images', 'edit any images', 'administer image galleries', 'import images'));
     $this->drupalGet('logout');
     $this->drupalLoginUser($this->web_user);
   }
Index: tests/image.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/tests/image.test,v
retrieving revision 1.6
diff -u -p -r1.6 image.test
--- tests/image.test	22 May 2009 19:32:30 -0000	1.6
+++ tests/image.test	26 Jun 2009 12:29:44 -0000
@@ -21,7 +21,7 @@ class ImageTestCase extends DrupalWebTes
     parent::setUp('image');
 
     // User to create images.
-    $this->web_user = $this->drupalCreateUser(array('create images', 'view original images', 'edit own images', 'edit images'));
+    $this->web_user = $this->drupalCreateUser(array('create images', 'view original images', 'edit own images', 'edit any images'));
     $this->drupalLogin($this->web_user);
 
     // Uploadable image.