diff --git a/ldap_authorization/ldap_authorization_og/LdapAuthorizationConsumerOG.class.php b/ldap_authorization/ldap_authorization_og/LdapAuthorizationConsumerOG.class.php index 31a6d32..e845a50 100644 --- a/ldap_authorization/ldap_authorization_og/LdapAuthorizationConsumerOG.class.php +++ b/ldap_authorization/ldap_authorization_og/LdapAuthorizationConsumerOG.class.php @@ -704,7 +704,7 @@ class LdapAuthorizationConsumerOG extends LdapAuthorizationConsumerAbstract { foreach ($og_actions['revokes'] as $group_entity_type => $gids) { foreach ($gids as $gid => $revoking_rids) { // $revoking_rids are all rids to be removed. may include authen rids $all_group_roles = og_roles($group_entity_type, FALSE, $gid, FALSE, TRUE); // all roles rid => role_name array w/ authen or anon roles - $all_group_rids = array_keys($all_group_roles); // all rids array w/ authen or anon rids + $all_group_rids = array_keys($all_group_roles); // all rids array w/ authen or anon rids $users_group_rids = array_keys(og_get_user_roles($group_entity_type, $gid, $user->uid, TRUE)); // users current rids w/authen or anon roles returned $remaining_rids = array_diff($users_group_rids, $revoking_rids); // rids to be left at end of revoke process $authenticated_rid = array_search(OG_AUTHENTICATED_ROLE, $all_group_roles); @@ -718,7 +718,7 @@ class LdapAuthorizationConsumerOG extends LdapAuthorizationConsumerAbstract { unset($user_auth_data[ldap_authorization_og_authorization_id($gid, $rid, $group_entity_type)]); } // define('OG_ANONYMOUS_ROLE', 'non-member'); define('OG_AUTHENTICATED_ROLE', 'member'); - if (in_array($authenticated_rid, $revoking_rids) || count($remaining_rids) == 0) { // ungroup if only authenticated and anonymous role left + if (count($remaining_rids) == 0) { // ungroup if only authenticated and anonymous role left $entity = og_ungroup($group_entity_type, $gid, 'user', $user->uid); $result = (boolean)($entity); }