diff options
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.module | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index a8c698af7..5b80fc7f0 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1664,7 +1664,6 @@ function user_admin_account() { $header = array( array('data' => t('Username'), 'field' => 'u.name'), array('data' => t('Status'), 'field' => 'u.status'), - array('data' => t('Roles')), array('data' => t('Member for'), 'field' => 'u.created', 'sort' => 'desc'), array('data' => t('Last access'), 'field' => 'u.access'), t('Operations') @@ -1676,20 +1675,13 @@ function user_admin_account() { $status = array(t('blocked'), t('active')); $destination = drupal_get_destination(); while ($account = db_fetch_object($result)) { - $rolesresult = db_query('SELECT r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d', $account->uid); - $roles = array(); - - while ($role = db_fetch_object($rolesresult)) { - $roles[] = $role->name; - } - - $rows[] = array(format_name($account), $status[$account->status], implode(', ', $roles), format_interval(time() - $account->created), t('%time ago', array('%time' => format_interval(time() - $account->access))), l(t('edit'), "user/$account->uid/edit", array(), $destination)); + $rows[] = array(format_name($account), $status[$account->status], format_interval(time() - $account->created), t('%time ago', array('%time' => format_interval(time() - $account->access))), l(t('edit'), "user/$account->uid/edit", array(), $destination)); } $pager = theme('pager', NULL, 50, 0, tablesort_pager()); if (!empty($pager)) { - $rows[] = array(array('data' => $pager, 'colspan' => '6')); + $rows[] = array(array('data' => $pager, 'colspan' => '5')); } return theme('table', $header, $rows); } |