Merge pull request #18338 from agileware/CIVICRM-1555

[civicrm-core.git] / setup / plugins / init / Drupal.civi-setup.php

diff --git a/setup/plugins/init/Drupal.civi-setup.php b/setup/plugins/init/Drupal.civi-setup.php
index 75e7c5a3d4c87756ce88560e34dec84eb9c5860a..d57ff432c21cfa4f80be5129073b00d7e4a9dceb 100644 (file)
--- a/setup/plugins/init/Drupal.civi-setup.php
+++ b/setup/plugins/init/Drupal.civi-setup.php
@@ -37,11 +37,13 @@ if (!defined('CIVI_SETUP')) {
 
     // Compute DSN.
     global $databases;
+    $ssl_params = \Civi\Setup\DrupalUtil::guessSslParams($databases['default']['default']);
     $model->db = $model->cmsDb = array(
       'server' => \Civi\Setup\DbUtil::encodeHostPort($databases['default']['default']['host'], $databases['default']['default']['port'] ?: NULL),
       'username' => $databases['default']['default']['username'],
       'password' => $databases['default']['default']['password'],
       'database' => $databases['default']['default']['database'],
+      'ssl_params' => empty($ssl_params) ? NULL : $ssl_params,
     );
 
     // Compute cmsBaseUrl.
@@ -59,7 +61,7 @@ if (!defined('CIVI_SETUP')) {
 
     // Compute default locale.
     global $language;
-    $model->lang = \Civi\Setup\LocaleUtil::pickClosest($language->langcode, $model->getField('lang', 'options'));
+    $model->lang = \Civi\Setup\LocaleUtil::pickClosest($language->langcode ?? NULL, $model->getField('lang', 'options'));
   });
 
 function _drupal_civisetup_getPublicFiles() {