- Patch #325665 by chx, Damien Tournoud, justinrandell et al: improved the cache registry lookups.

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index c58cbb648..370b7e05c 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -510,7 +510,7 @@ function user_admin_perm($form_state, $rid = NULL) {
   // Render role/permission overview:
   $options = array();
   $hide_descriptions = !system_admin_compact_mode();
-  foreach (module_list(FALSE, FALSE, TRUE) as $module) {
+  foreach (module_implements('perm') as $module) {
     if ($permissions = module_invoke($module, 'perm')) {
       $form['permission'][] = array(
         '#markup' => $module,
diff --git a/modules/user/user.module b/modules/user/user.module
index 84ba50441..224d44d41 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1917,7 +1917,7 @@ function user_help($path, $arg) {
 function _user_categories($account) {
   $categories = array();
 
-  foreach (module_list() as $module) {
+  foreach (module_implements('user_categories') as $module) {
     if ($data = module_invoke($module, 'user_categories', NULL, $account, '')) {
       $categories = array_merge($data, $categories);
     }