From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Wed, 22 Jul 2015 05:03:51 +0000 (+1200)
Subject: add patch for drupal 8 install
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=09d7c1e52f5406e175886dec8643383b0223dff3;p=civicrm-core.git

add patch for drupal 8 install

This should not affect other drupal versions as they will have VERSION defined - reading the code shows that is implicit in existing assumptions
---

diff --git a/install/civicrm.php b/install/civicrm.php
index 8438e850fa..30b696a826 100644
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -208,7 +208,7 @@ function civicrm_config(&$config) {
   );
 
   $params['baseURL'] = isset($config['base_url']) ? $config['base_url'] : civicrm_cms_base();
-  if ($installType == 'drupal') {
+  if ($installType == 'drupal' && defined('VERSION')) {
     if (version_compare(VERSION, '7.0-rc1') >= 0) {
       $params['cms'] = 'Drupal';
       $params['CMSdbUser'] = addslashes($config['drupal']['username']);
@@ -224,6 +224,13 @@ function civicrm_config(&$config) {
       $params['CMSdbName'] = addslashes($config['drupal']['database']);
     }
   }
+  else if ($installType == 'drupal') {
+    $params['cms'] = $config['cms'];
+    $params['CMSdbUser'] = addslashes($config['cmsdb']['username']);
+    $params['CMSdbPass'] = addslashes($config['cmsdb']['password']);
+    $params['CMSdbHost'] = $config['cmsdb']['server'];
+    $params['CMSdbName'] = addslashes($config['cmsdb']['database']);
+  }
   else {
     $params['cms'] = 'WordPress';
     $params['CMSdbUser'] = addslashes(DB_USER);