Merge pull request #12976 from civicrm/5.7

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

diff --git a/CRM/Core/CodeGen/Config.php b/CRM/Core/CodeGen/Config.php
index 74c7a59fb29b7d6cf7ec621ba1d4d6d7c0928eaa..1d6b2431d196ddacdd201ec4c170b65c434b716d 100644 (file)
--- a/CRM/Core/CodeGen/Config.php
+++ b/CRM/Core/CodeGen/Config.php
@@ -5,15 +5,9 @@
  */
 class CRM_Core_CodeGen_Config extends CRM_Core_CodeGen_BaseTask {
   public function run() {
-    $this->generateTemplateVersion();
-
     $this->setupCms();
   }
 
-  public function generateTemplateVersion() {
-    file_put_contents($this->config->tplCodePath . "/CRM/common/version.tpl", $this->config->db_version);
-  }
-
   public function setupCms() {
     if (!in_array($this->config->cms, array(
       'backdrop',
@@ -35,12 +29,6 @@ class CRM_Core_CodeGen_Config extends CRM_Core_CodeGen_BaseTask {
         throw new Exception("Failed to locate template for civicrm.config.php");
       }
     }
-
-    echo "Generating civicrm-version file\n";
-    $template = new CRM_Core_CodeGen_Util_Template('php');
-    $template->assign('db_version', $this->config->db_version);
-    $template->assign('cms', ucwords($this->config->cms));
-    $template->run('civicrm_version.tpl', $this->config->phpCodePath . "civicrm-version.php");
   }
 
   /**
@@ -68,12 +56,12 @@ class CRM_Core_CodeGen_Config extends CRM_Core_CodeGen_BaseTask {
       case 'drupal8':
         $candidates[] = "../../modules/civicrm/civicrm.config.php.drupal";
         $candidates[] = "../../../modules/civicrm/civicrm.config.php.drupal";
+        $candidates[] = "../../../modules/civicrm-drupal/civicrm.config.php.drupal";
         break;
 
       case 'wordpress':
         $candidates[] = "../../civicrm.config.php.wordpress";
         $candidates[] = "../WordPress/civicrm.config.php.wordpress";
-        $candidates[] = "../drupal/civicrm.config.php.drupal";
         break;
     }
     foreach ($candidates as $candidate) {