summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/user/user.admin.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 370b7e05c..c08e19fbf 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -512,8 +512,9 @@ function user_admin_perm($form_state, $rid = NULL) {
$hide_descriptions = !system_admin_compact_mode();
foreach (module_implements('perm') as $module) {
if ($permissions = module_invoke($module, 'perm')) {
+ $info = drupal_parse_info_file(drupal_get_path('module', $module) . "/$module.info");
$form['permission'][] = array(
- '#markup' => $module,
+ '#markup' => $info['name'],
);
foreach ($permissions as $perm => $perm_item) {
$options[$perm] = '';
@@ -576,7 +577,7 @@ function theme_user_admin_perm($form) {
$row = array();
// Module name
if (is_numeric($key)) {
- $row[] = array('data' => t('@module module', array('@module' => drupal_render($form['permission'][$key]))), 'class' => 'module', 'id' => 'module-' . $form['permission'][$key]['#markup'], 'colspan' => count($form['role_names']) + 1);
+ $row[] = array('data' => drupal_render($form['permission'][$key]), 'class' => 'module', 'id' => 'module-' . $form['permission'][$key]['#markup'], 'colspan' => count($form['role_names']) + 1);
}
else {
// Permission row.