diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-12-19 11:15:18 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-12-19 11:15:18 +0000 |
| commit | c8826a6bc5ce3daf5b4681f4eba181ec70414f74 (patch) | |
| tree | c3ebc0af5727b9f9de36c70d4d98a1555c33d03c /includes | |
| parent | ff6ce75f7b41eb8806b679d3901f7ac6cee8a6e8 (diff) | |
| download | brdo-c8826a6bc5ce3daf5b4681f4eba181ec70414f74.tar.gz brdo-c8826a6bc5ce3daf5b4681f4eba181ec70414f74.tar.bz2 | |
#110981 by saxofaan: allow contrib modules in install profiles and runtime to have requirements, just like core modules; also fix a consistency between message presentation in install and runtime requirements
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/install.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/includes/install.inc b/includes/install.inc index f98e56e9d..42cdf73f2 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -251,7 +251,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; } @@ -719,7 +719,11 @@ function drupal_check_module($module) { // 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'); + $message = $requirement['description']; + if (isset($requirement['value']) && $requirement['value']) { + $message .= ' ('. t('Currently using !item !version', array('!item' => $requirement['title'], '!version' => $requirement['value'])) .')'; + } + drupal_set_message($message, 'error'); } } return FALSE; |