summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-11-14 21:22:46 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-11-14 21:22:46 +0000
commit4575c982a2348cc2f9f5c6f6ee5531fe5a40f644 (patch)
tree3ec8a0f8ea87ee0597067d0c44a2e343e4aa6adc
parentab21e07bbd3ac303495a9cce99862d84bba0893e (diff)
downloadbrdo-4575c982a2348cc2f9f5c6f6ee5531fe5a40f644.tar.gz
brdo-4575c982a2348cc2f9f5c6f6ee5531fe5a40f644.tar.bz2
#740258 by coltrane, mr.baileys: Fixed Permissions not shown when module human-readable name conflicts.
-rw-r--r--modules/user/user.admin.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index fc4911352..ce8a70f6a 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -678,11 +678,11 @@ function user_admin_permissions($form, $form_state, $rid = NULL) {
// display name.
$modules = array();
foreach (module_implements('permission') as $module) {
- $modules[$module_info[$module]['name']] = $module;
+ $modules[$module] = $module_info[$module]['name'];
}
- ksort($modules);
+ asort($modules);
- foreach ($modules as $display_name => $module) {
+ foreach ($modules as $module => $display_name) {
if ($permissions = module_invoke($module, 'permission')) {
$form['permission'][] = array(
'#markup' => $module_info[$module]['name'],