cvs -z9 diff -u -uF^function -- user.module (in directory C:\devroot\cvs-drupal\drupal\modules\) Index: user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/Attic/user.module,v retrieving revision 1.612.2.17 diff -u -u -F^function -r1.612.2.17 user.module --- user.module 3 Aug 2006 13:53:15 -0000 1.612.2.17 +++ user.module 15 Aug 2006 20:04:54 -0000 @@ -1799,6 +1799,14 @@ function user_admin_perm($str_rids = NUL } function theme_user_admin_perm($form) { + // get a list of role names for later use + $result = db_query('SELECT rid, name FROM {role} ORDER BY name'); + + $role_names = array(); + while ($role = db_fetch_object($result)) { + $role_names[$role->rid] = $role->name; + } + foreach (element_children($form['permission']) as $key) { // Don't take form control structures if (is_array($form['permission'][$key])) { @@ -1812,7 +1820,7 @@ function theme_user_admin_perm($form) { $row[] = array('data' => form_render($form['permission'][$key]), 'class' => 'permission'); foreach (element_children($form['checkboxes']) as $rid) { if (is_array($form['checkboxes'][$rid])) { - $row[] = array('data' => form_render($form['checkboxes'][$rid][$key]), 'align' => 'center', 'title' => t($key)); + $row[] = array('data' => form_render($form['checkboxes'][$rid][$key]), 'align' => 'center', 'title' => t('%role : %perm', array('%role' => $role_names[$rid], '%perm' => t($key) ))); } } }