diff options
| -rw-r--r-- | includes/install.inc | 8 | ||||
| -rw-r--r-- | install.php | 2 |
2 files changed, 7 insertions, 3 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; diff --git a/install.php b/install.php index 8dad06b52..65fc3903f 100644 --- a/install.php +++ b/install.php @@ -867,7 +867,7 @@ function install_check_requirements($profile, $verify) { foreach ($requirements as $requirement) { if (isset($requirement['severity']) && $requirement['severity'] == REQUIREMENT_ERROR) { $message = $requirement['description']; - if ($requirement['value']) { + if (isset($requirement['value']) && $requirement['value']) { $message .= ' ('. st('Currently using !item !version', array('!item' => $requirement['title'], '!version' => $requirement['value'])) .')'; } drupal_set_message($message, 'error'); |