diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system/system.install | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index eb6d01736..05d910e30 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -33,7 +33,7 @@ function system_requirements($phase) { // is not running the default install profile. $profile = drupal_get_profile(); if ($profile != 'standard') { - $info = install_profile_info($profile); + $info = system_get_info('module', $profile); $requirements['install_profile'] = array( 'title' => $t('Install profile'), 'value' => $t('%profile_name (%profile-%version)', array( diff --git a/modules/system/system.module b/modules/system/system.module index 8d09febf3..2cb42b84c 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -2387,9 +2387,14 @@ function _system_rebuild_module_data() { drupal_alter('system_info', $modules[$key]->info, $modules[$key], $type); } - // The install profile is required, if it's a valid module. if (isset($modules[$profile])) { + // The install profile is required, if it's a valid module. $modules[$profile]->info['required'] = TRUE; + // Add a default distribution name if the profile did not provide one. This + // matches the default value used in install_profile_info(). + if (!isset($modules[$profile]->info['distribution_name'])) { + $modules[$profile]->info['distribution_name'] = 'Drupal'; + } } return $modules; |