5 files changed, 6 insertions, 6 deletions
diff --git a/modules/block/block.module b/modules/block/block.module
index 9c482e1de..95756a943 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -239,7 +239,7 @@ function _block_rehash() {
   // Valid region names for the theme.
   $regions = system_region_list($theme_key);
 
-  foreach (module_list() as $module) {
+  foreach (module_implements('block') as $module) {
     $module_blocks = module_invoke($module, 'block', 'list');
     if ($module_blocks) {
       foreach ($module_blocks as $delta => $block) {
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 03db7b683..fe94ba191 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -657,7 +657,7 @@ function system_modules($form_state = array()) {
       }
     }
     // Generate link for module's help page, if there is one.
-    if ($help_arg && module_hook($filename, 'help')) {
+    if ($help_arg && $module->status && in_array($filename, module_implements('help'))) {
       if (module_invoke($filename, 'help', "admin/help#$filename", $help_arg)) {
         // Module has a help page.
         $extra['help'] = theme('more_help_link', url("admin/help/$filename"));
diff --git a/modules/system/system.module b/modules/system/system.module
index 48ac89a63..b4f796986 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1398,12 +1398,12 @@ function system_get_module_admin_tasks($module) {
   $admin_tasks = array();
   $admin_task_count = 0;
   // Check for permissions.
-  if (module_hook($module, 'perm') && $admin_access) {
+  if (in_array($module, module_implements('perm')) && $admin_access) {
     $admin_tasks[-1] = l(t('Configure permissions'), 'admin/user/permissions', array('fragment' => 'module-' . $module));
   }
 
   // Check for menu items that are admin links.
-  if ($menu = module_invoke($module, 'menu')) {
+  if (in_array($module, module_implements('menu')) && $menu = module_invoke($module, 'menu')) {
     foreach (array_keys($menu) as $path) {
       if (isset($items[$path])) {
         $admin_tasks[$items[$path]['title'] . $admin_task_count ++] = l($items[$path]['title'], $path);
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);
     }