Merge pull request #23834 from colemanw/deleteCustomOption

[civicrm-core.git] / install / civicrm.php

diff --git a/install/civicrm.php b/install/civicrm.php
index 2f895d550dbca9815901817b8adc2ba8faf9cdc8..6d08fcf94fa9a5b8bf1c8a88c983dd6de4603114 100644 (file)
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -205,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();
@@ -223,13 +227,6 @@ function civicrm_config(&$config) {
       $params['CMSdbHost'] = $config['drupal']['server'];
       $params['CMSdbName'] = addslashes($config['drupal']['database']);
     }
-    elseif (version_compare(VERSION, '6.0') >= 0) {
-      $params['cms'] = 'Drupal6';
-      $params['CMSdbUser'] = addslashes($config['drupal']['username']);
-      $params['CMSdbPass'] = addslashes($config['drupal']['password']);
-      $params['CMSdbHost'] = $config['drupal']['server'];
-      $params['CMSdbName'] = addslashes($config['drupal']['database']);
-    }
   }
   elseif ($installType == 'drupal') {
     $params['cms'] = $config['cms'];