Index: acl.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acl/acl.module,v
retrieving revision 1.25
diff -u -r1.25 acl.module
--- acl.module	12 Jun 2010 22:13:33 -0000	1.25
+++ acl.module	2 Jul 2010 07:36:22 -0000
@@ -176,11 +176,11 @@
   }
   $result = db_query("SELECT n.*, 'acl' AS realm, n.acl_id AS gid, a.module FROM {acl_node} n INNER JOIN {acl} a ON n.acl_id = a.acl_id WHERE nid = :nid", array(
     'nid' => $node->nid,
-  ));
+  ), array('fetch' => PDO::FETCH_ASSOC));
   $grants = array();
   foreach ($result as $grant) {
-    if (module_invoke($grant->module, 'enabled')) {
-      if (acl_has_users($grant->gid)) {
+    if (module_invoke($grant['module'], 'enabled')) {
+      if (acl_has_users($grant['gid'])) {
         $grants[] = $grant;
       }
       else {
@@ -191,7 +191,7 @@
           'grant_view' => 0,
           'grant_update' => 0,
           'grant_delete' => 0,
-          'priority' => $grant->priority,
+          'priority' => $grant['priority'],
         );
       }
     }
Index: acl.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/acl/acl.admin.inc,v
retrieving revision 1.6
diff -u -r1.6 acl.admin.inc
--- acl.admin.inc	24 Jun 2010 19:22:21 -0000	1.6
+++ acl.admin.inc	2 Jul 2010 07:36:21 -0000
@@ -85,15 +85,14 @@
   $user_list = unserialize($form['user_list']['#value']);
   $button_name = 'acl_' . $form['acl_id']['#value'];
 
-  if (isset($form['#post'][$button_name]) && $form['#post'][$button_name] == $form['delete_button']['#value']) {
+  if (isset($form_state['triggering_element']) && $form_state['triggering_element']['#value'] == $form['delete_button']['#value']) {
     $deletions = $form['deletions']['#value'];
     foreach ($deletions as $uid) {
       unset($user_list[$uid]);
       unset($form['deletions']['#value'][$uid]);
     }
   }
-  elseif (isset($form['#post'][$button_name]) && $form['#post'][$button_name] == $form['add_button']['#value']) {
-
+  elseif (isset($form_state['triggering_element']) && $form_state['triggering_element']['#value'] == $form['add_button']['#value'] && !empty($form['add']['#value'])) {
     $user = db_query("SELECT uid, name FROM {users} WHERE name = :name", array(
       'name' => $form['add']['#value'],
     ))->fetchObject();
@@ -132,7 +131,7 @@
     ->condition('acl_id', $form['acl_id'])
     ->execute();
   foreach ($users as $uid => $name) {
-    db_insert('')
+    db_insert('acl_user')
     ->fields(array(
       'acl_id' => $form['acl_id'],
       'uid' => $uid,