summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Drumm2008-10-05 01:46:57 (GMT)
committer Neil Drumm2008-10-05 01:46:57 (GMT)
commitcfdf854e1fb37dade2d5e293b0c3cb9484f2d55c (patch)
tree9c448496685881151155130d6f16acc45958ac70
parent75790ad18a81b3c486c8564587c7747b9ffabd21 (diff)
#312730 by Damien Tournoud. hook_requirements('install') should work for modules that don't reside in the main './modules' folder.
-rw-r--r--includes/install.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/install.inc b/includes/install.inc
index ab29c25..d04f2f1 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -244,7 +244,7 @@ function drupal_rewrite_settings($settings = array(), $prefix = '') {
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));
+ $installs = array_merge($installs, drupal_system_listing($module .'.install$', 'modules'));
}
return $installs;
}
@@ -678,6 +678,7 @@ function _system_update_utf8($tables) {
*/
function drupal_check_profile($profile) {
include_once './includes/file.inc';
+ include_once './includes/common.inc';
$profile_file = "./profiles/$profile/$profile.profile";