From ca7b56e7351a7fe57d2c1d4c6feef44e2879caf0 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Tue, 27 Oct 2009 04:08:42 +0000
Subject: #561452 follow-up by David_Rothstein: Use helper functions rather
 than file scans to retrieve module data on permissions page.

---
 modules/system/system.updater.inc | 2 +-
 modules/user/user.admin.inc       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/system/system.updater.inc b/modules/system/system.updater.inc
index 2d373d1e5..8c23d915d 100644
--- a/modules/system/system.updater.inc
+++ b/modules/system/system.updater.inc
@@ -117,7 +117,7 @@ class ThemeUpdater extends Updater implements DrupalUpdaterInterface {
   public function postInstall() {
     // Update the system table.
     clearstatcache();
-    drupal_static_reset('_system_get_theme_data');
+    drupal_static_reset('_system_rebuild_theme_data');
     _system_rebuild_theme_data();
 
     // Active the theme
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 907b70a37..5273d19d7 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -650,12 +650,12 @@ function user_admin_permissions($form, $form_state, $rid = NULL) {
   );
   // Render role/permission overview:
   $options = array();
+  $module_info = system_get_info('module');
   $hide_descriptions = !system_admin_compact_mode();
   foreach (module_implements('permission') as $module) {
     if ($permissions = module_invoke($module, 'permission')) {
-      $info = drupal_parse_info_file(drupal_get_path('module', $module) . "/$module.info");
       $form['permission'][] = array(
-        '#markup' => $info['name'],
+        '#markup' => $module_info[$module]['name'],
         '#id' => $module,
       );
       foreach ($permissions as $perm => $perm_item) {
-- 
cgit v1.2.3