diff --git a/core/includes/install.inc b/core/includes/install.inc index 77e0b70..9c83e2d 100644 --- a/core/includes/install.inc +++ b/core/includes/install.inc @@ -446,7 +446,9 @@ function _drupal_rewrite_settings_dump($variable, $variable_name) { * into settings.php. */ function _drupal_rewrite_settings_dump_one(\stdClass $variable, $prefix = '', $suffix = '') { - $return = $prefix . var_export($variable->value, TRUE) . ';'; + $export = !isset($variable->export) || !empty($variable->export); + $value = $export ? var_export($variable->value, TRUE) : $variable->value; + $return = $prefix . $value . ';'; if (!empty($variable->comment)) { $return .= ' // ' . $variable->comment; } diff --git a/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php b/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php index 6a71db4..aca8973 100644 --- a/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php +++ b/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php @@ -178,6 +178,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { ); $settings['settings']['container_yamls'][0] = (object) array( 'value' => "__DIR__ . '/services.yml'", + 'export' => FALSE, 'required' => TRUE, ); // Remember the profile which was used.