X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=install%2Fcivicrm.php;h=5179735d0825615d07ff8e65da8f3be83e74de41;hb=a1b8cf39cd83602d9560adfa94311b5c4bb83137;hp=e6886134039281a2c69874ea93a06aac6b3bad53;hpb=3be8a215438791d56760380a748c824f1167cc62;p=civicrm-core.git

diff --git a/install/civicrm.php b/install/civicrm.php
index e688613403..5179735d08 100644
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -89,7 +89,7 @@ function civicrm_main(&$config) {
   civicrm_source($dsn, $sqlPath . DIRECTORY_SEPARATOR . 'civicrm.mysql');
 
   if (!empty($config['loadGenerated'])) {
-    civicrm_source($dsn, $sqlPath . DIRECTORY_SEPARATOR . 'civicrm_generated.mysql', TRUE);
+    civicrm_source($dsn, $sqlPath . DIRECTORY_SEPARATOR . 'civicrm_generated.mysql');
   }
   else {
     if (isset($config['seedLanguage'])
@@ -131,8 +131,6 @@ function civicrm_main(&$config) {
 function civicrm_source($dsn, $fileName, $lineMode = FALSE) {
   global $crmPath;
 
-  require_once "$crmPath/packages/DB.php";
-
   // CRM-19699 See also CRM_Core_DAO for PHP7 mysqli compatiblity.
   // Duplicated here because this is not using CRM_Core_DAO directly
   // and this function may be called directly from Drush.
@@ -207,6 +205,10 @@ function civicrm_config(&$config) {
     'dbPass' => addslashes($config['mysql']['password']),
     'dbHost' => $config['mysql']['server'],
     'dbName' => addslashes($config['mysql']['database']),
+    // These need to be filled manually when using the old installer if an
+    // SSL connection to MySQL is needed.
+    'dbSSL' => '',
+    'CMSdbSSL' => '',
   );
 
   $params['baseURL'] = $config['base_url'] ?? civicrm_cms_base();