Index: includes/install.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.inc,v
retrieving revision 1.31.2.1
diff -u -p -r1.31.2.1 install.inc
--- includes/install.inc	6 Feb 2007 08:20:17 -0000	1.31.2.1
+++ includes/install.inc	13 May 2007 20:11:03 -0000
@@ -235,20 +235,6 @@ function drupal_rewrite_settings($settin
 }
 
 /**
- * Get list of all .install files.
- *
- * @param $module_list
- *   An array of modules to search for their .install files.
- */
-function drupal_get_install_files($module_list = array()) {
-  $installs = array();
-  foreach ($module_list as $module) {
-    $installs = array_merge($installs, file_scan_directory('./modules', "^$module.install$", array('.', '..', 'CVS'), 0, TRUE, 'name', 0));
-  }
-  return $installs;
-}
-
-/**
  * Verify a profile for installation.
  *
  * @param profile
@@ -689,15 +675,11 @@ function drupal_check_profile($profile) 
   $function = $profile .'_profile_modules';
   $module_list = array_unique(array_merge(array('system'), $function()));
 
-  // Get a list of all .install files.
-  $installs = drupal_get_install_files($module_list);
-
   // Collect requirement testing results
-  $requirements = array();
-  foreach ($installs as $install) {
-    require_once $install->filename;
-    if (module_hook($install->name, 'requirements')) {
-      $requirements = array_merge($requirements, module_invoke($install->name, 'requirements', 'install'));
+  foreach ($module_list as $module) {
+    module_load_install($module);
+    if (module_hook($module, 'requirements')) {
+      $requirements = array_merge($requirements, module_invoke($module, 'requirements', 'install'));
     }
   }
   return $requirements;
@@ -721,21 +703,17 @@ function drupal_requirements_severity(&$
  */
 function drupal_check_module($module) {
   // Include install file
-  $install = drupal_get_install_files(array($module));
-  if (isset($install[$module])) {
-    require_once $install[$module]->filename;
-
-    // Check requirements
-    $requirements = module_invoke($module, 'requirements', 'install');
-    if (is_array($requirements) && drupal_requirements_severity($requirements) == REQUIREMENT_ERROR) {
-      // Print any error messages
-      foreach ($requirements as $requirement) {
-        if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) {
-          drupal_set_message($requirement['description'] .' ('. t('Currently using !item !version', array('!item' => $requirement['title'], '!version' => $requirement['value'])) .')', 'error');
-        }
+  module_load_install($module);
+  // Check requirements
+  $requirements = module_invoke($module, 'requirements', 'install');
+  if (is_array($requirements) && drupal_requirements_severity($requirements) == REQUIREMENT_ERROR) {
+    // Print any error messages
+    foreach ($requirements as $requirement) {
+      if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) {
+        drupal_set_message($requirement['description'] .' ('. t('Currently using !item !version', array('!item' => $requirement['title'], '!version' => $requirement['value'])) .')', 'error');
       }
-      return FALSE;
     }
+    return FALSE;
   }
   return TRUE;
 }