diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-21 02:27:47 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-06-21 02:27:47 +0000 |
| commit | ce19c671106df767202972d22736db3582f6423b (patch) | |
| tree | d25953ac2bf8c151c422cec3419273bf259f0f8e /includes/install.inc | |
| parent | 34dbad55c589b8c1f3c3fc1eadfb88d989516695 (diff) | |
| download | brdo-ce19c671106df767202972d22736db3582f6423b.tar.gz brdo-ce19c671106df767202972d22736db3582f6423b.tar.bz2 | |
#293223 follow-up by David_Rothstein: Roll back 'Hide required core modules'. This was removing useful information to both new and experienced site builders, as well as hiding critical 'help' links.
Diffstat (limited to 'includes/install.inc')
| -rw-r--r-- | includes/install.inc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/includes/install.inc b/includes/install.inc index c5083eb0a..9d159a7fd 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -187,8 +187,18 @@ function drupal_set_installed_schema_version($module, $version) { * @see install_profile_info() */ function drupal_install_profile_distribution_name() { - global $install_state; - return $install_state['profile_info']['distribution_name']; + // During installation, the profile information is stored in the global + // installation state (it might not be saved anywhere yet). + if (drupal_installation_attempted()) { + global $install_state; + return $install_state['profile_info']['distribution_name']; + } + // At all other times, we load the profile via standard methods. + else { + $profile = drupal_get_profile(); + $info = install_profile_info($profile); + return $info['distribution_name']; + } } /** |