From e819ccc96b56495221506fe6796f01f214b7506c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 19 Feb 2011 00:50:43 +0000
Subject: - Patch #1014130 by catch, carlos8f, David_Rothstein:
 install_profile_info() does a file system scan on every request to
 admin/config (and etc.).

---
 modules/system/system.install | 2 +-
 modules/system/system.module  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'modules/system')

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;
-- 
cgit v1.2.3