Index: image.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.install,v
retrieving revision 1.26
diff -u -p -r1.26 image.install
--- image.install	8 Aug 2009 13:32:53 -0000	1.26
+++ image.install	8 Aug 2009 18:38:54 -0000
@@ -337,11 +337,14 @@ function image_update_6102() {
 /**
  * Rename permission "edit images" to "edit any images".
  */
-function image_gallery_update_6103() {
+function image_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'));
+    $renamed_permission = strtr($role->perm, array(
+      'edit images' => 'edit any images, delete any images',
+      'edit own images' => 'edit own images, delete own images',
+    ));
     if ($renamed_permission != $role->perm) {
       $ret[] = update_sql("UPDATE {permission} SET perm = '$renamed_permission' WHERE rid = $role->rid");
     }
Index: image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.module,v
retrieving revision 1.308
diff -u -p -r1.308 image.module
--- image.module	8 Aug 2009 13:32:53 -0000	1.308
+++ image.module	8 Aug 2009 18:40:42 -0000
@@ -81,7 +81,7 @@ function image_node_info() {
  * Implementation of hook_perm
  */
 function image_perm() {
-  return array('create images', 'delete own images', 'delete any images', 'edit own images', 'edit any images', 'view original images');
+  return array('view original images', 'create images', 'edit own images', 'edit any images', 'delete own images', 'delete any images');
 }
 
 /**
@@ -90,14 +90,22 @@ function image_perm() {
 function image_access($op, $node, $account) {
   switch ($op) {
     case 'create':
-        return user_access('create images', $account);
+      if (user_access('create images', $account)) {
+        return TRUE;
+      }
       break;
+
     case 'update':
-      return (user_access('edit any images', $account) || user_access('edit own images', $account) && ($account->uid == $node->uid));
+      if (user_access('edit any images', $account) || user_access('edit own images', $account) && ($account->uid == $node->uid)) {
+        return TRUE;
+      }
       break;
+
     case 'delete':
-      return (user_access('delete any images', $account) || user_access('delete own images', $account) && ($account->uid == $node->uid));
-      break;      
+      if (user_access('delete any images', $account) || user_access('delete own images', $account) && ($account->uid == $node->uid)) {
+        return TRUE;
+      }
+      break;
   }
 }