Index: role_delegation.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/role_delegation/role_delegation.module,v
retrieving revision 1.14.2.3
diff -u -r1.14.2.3 role_delegation.module
--- role_delegation.module	4 Jan 2010 17:11:48 -0000	1.14.2.3
+++ role_delegation.module	4 Jan 2010 19:28:03 -0000
@@ -65,7 +65,7 @@
   $roles = _role_delegation_roles();
   $roles_preserve = array('authenticated user');
   foreach ($roles as $rid => $role) {
-    if (!(user_access('assign all roles') || user_access(_role_delegation_make_perm($role)) || user_access('administer permissions'))) {
+    if (!(user_access('assign all roles') || user_access(_role_delegation_make_perm($role)))) {
       // Hide roles the user can't assign.
       $form['roles'][$rid] = array(
         '#type' => 'value',
@@ -130,9 +130,6 @@
     return FALSE;
   }
   // Check access to role assignment page.
-  if (user_access('administer permissions')) {
-    return TRUE;
-  }
   $perms = role_delegation_perm();
   foreach ($perms as $perm) {
     if (user_access($perm)) {
@@ -165,8 +162,6 @@
  */
 function role_delegation_user($op, &$edit, &$account, $category = NULL) {
   if ($op == 'register' || ($op == 'form' && $category == 'account')) {
-    // Only alter user form when user can't assign permissions without Role Delegation.
-    if (!user_access('administer permissions')) {
       // Split up roles based on whether they can be delegated or not.
       $current_roles = isset($account->roles) ? $account->roles : array();
       $rids_default = array();
@@ -205,7 +200,6 @@
         '#default_value' => $rids_default,
       );
       return $form;
-    }
   }
   elseif (isset($edit['roles_assign']) && ($op == 'insert' || $op == 'submit')) {
     $edit['roles'] = $edit['roles_preserve'] + array_filter($edit['roles_assign']);
@@ -216,12 +210,6 @@
  * Implementation of hook_user_operations().
  */
 function role_delegation_user_operations($form_state = array()) {
-  // Only provide role add/remove operations when user can't assign permissions
-  // without Role Delegation.
-  if (user_access('administer permissions')) {
-    return;
-  }
-
   // Provide add/remove operations for delegated roles.
   $roles = _role_delegation_roles();
   $add_roles = array();