Merge https://github.com/civicrm/civicrm-core/pull/6276

[civicrm-core.git] / CRM / Core / CodeGen / Config.php

diff --git a/CRM/Core/CodeGen/Config.php b/CRM/Core/CodeGen/Config.php
index dfa58413d29e99b0fdd67c789fbe5104ae436557..b31b172128d043aa42d4df82d82b25670c8da6e2 100644 (file)
--- a/CRM/Core/CodeGen/Config.php
+++ b/CRM/Core/CodeGen/Config.php
@@ -17,6 +17,7 @@ class CRM_Core_CodeGen_Config extends CRM_Core_CodeGen_BaseTask {
   public function setupCms() {
     if (!in_array($this->config->cms, array(
       'drupal',
+      'drupal8',
       'joomla',
       'wordpress',
     ))) {
@@ -55,6 +56,11 @@ class CRM_Core_CodeGen_Config extends CRM_Core_CodeGen_BaseTask {
         $candidates[] = "../../drupal/civicrm.config.php.drupal";
         break;
 
+      case 'drupal8':
+        $candidates[] = "../../modules/civicrm/civicrm.config.php.drupal";
+        $candidates[] = "../../../modules/civicrm/civicrm.config.php.drupal";
+        break;
+
       case 'wordpress':
         $candidates[] = "../../civicrm.config.php.wordpress";
         $candidates[] = "../WordPress/civicrm.config.php.wordpress";
@@ -69,4 +75,5 @@ class CRM_Core_CodeGen_Config extends CRM_Core_CodeGen_BaseTask {
     }
     return NULL;
   }
+
 }