From 4575c982a2348cc2f9f5c6f6ee5531fe5a40f644 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sun, 14 Nov 2010 21:22:46 +0000
Subject: #740258 by coltrane, mr.baileys: Fixed Permissions not shown when
 module human-readable name conflicts.

---
 modules/user/user.admin.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

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'],
-- 
cgit v1.2.3