diff --git a/install/civicrm.php b/install/civicrm.php index 2f2c9e3d19e48767d14b6820e9672a3c3b31e718..21ac16abd1c5fa00004f4e9d3bd2490ccdf979c7 100644 --- a/install/civicrm.php +++ b/install/civicrm.php @@ -187,23 +187,21 @@ function civicrm_config(&$config) { ); $params['baseURL'] = isset($config['base_url']) ? $config['base_url'] : civicrm_cms_base(); - if ($installType == 'drupal' && - version_compare(VERSION, '7.0-rc1') >= 0 - ) { - $params['cms'] = 'Drupal'; - $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' && - 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']); + if ($installType == 'drupal') { + if (version_compare(VERSION, '7.0-rc1') >= 0) { + $params['cms'] = 'Drupal'; + $params['CMSdbUser'] = addslashes($config['drupal']['username']); + $params['CMSdbPass'] = addslashes($config['drupal']['password']); + $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']); + } } else { $params['cms'] = 'WordPress'; @@ -211,6 +209,9 @@ function civicrm_config(&$config) { $params['CMSdbPass'] = addslashes(DB_PASSWORD); $params['CMSdbHost'] = DB_HOST; $params['CMSdbName'] = addslashes(DB_NAME); + + // CRM-12386 + $params['crmRoot'] = addslashes($params['crmRoot']); } $params['siteKey'] = md5(uniqid('', TRUE) . $params['baseURL']);