diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index da9f11b..2313705 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -2178,6 +2178,16 @@ function install_write_profile($install_state) { 'value' => $install_state['parameters']['profile'], 'required' => TRUE, ); + } + // Add specified base_profile to the settings profile_directories. + if (isset($install_state['profiles'][$install_state['profile_info']['base_profile']]) && empty(Settings::get('profile_directories'))) { + $path = $install_state['profiles'][$install_state['profile_info']['base_profile']]->getPath(); + $settings['settings']['profile_directories'] = (object) array( + 'value' => array($path), + 'required' => TRUE, + ); + } + if (!empty($settings)) { drupal_rewrite_settings($settings); } } diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php index d42c550..88246ea 100644 --- a/core/lib/Drupal/Core/DrupalKernel.php +++ b/core/lib/Drupal/Core/DrupalKernel.php @@ -721,6 +721,10 @@ protected function moduleData($module) { $profile_directories = array_map(function ($profile) { return $profile->getPath(); }, $profiles); + + // Allow additional profile directories to be added from settings.php. + // This provides support for "base profiles". + $profile_directories = array_merge(Settings::get('profile_directories', []), $profile_directories); $listing->setProfileDirectories($profile_directories); // Now find modules. diff --git a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php index 3d68561..785c654 100644 --- a/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php +++ b/core/lib/Drupal/Core/Extension/ExtensionDiscovery.php @@ -22,6 +22,13 @@ * @encode * to your settings.php. * + * To add additional profile directories, add + * @code + * $settings['profile_directories'] = array(path); + * @encode + * to your settings.php. If multiple paths are specified, they are searched + * from last to first. + * */ class ExtensionDiscovery { @@ -256,6 +263,11 @@ public function setProfileDirectoriesFromSettings() { if ($profile) { $this->profileDirectories[] = drupal_get_path('profile', $profile); } + + // Allow additional profile directories to be added from settings.php. + // This provides support for "base profiles". + $this->profileDirectories = array_merge(Settings::get('profile_directories', []), $this->profileDirectories); + return $this; }