Merge pull request #11695 from JMAConsulting/civicrm-setup#11

[civicrm-setup#11] Remove templates/CRM/common/version.tpl
civicrm · Feb 21, 2018 · 59a83d2 · 59a83d2
2 parents b810074 + 6c9d7e1
commit 59a83d2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,6 @@ sql/civicrm_data.mysql
 sql/civicrm_drop.mysql
 sql/civicrm_navigation.mysql
 sql/civicrm_sample.mysql
-templates/CRM/common/version.tpl
 tests/phpunit/CiviTest/CiviSeleniumSettings.php
 tests/phpunit/CiviTest/civicrm.settings.php
 tools/stats/config.php

diff --git a/CRM/Core/CodeGen/Version.php b/CRM/Core/CodeGen/Version.php
@@ -7,8 +7,6 @@ class CRM_Core_CodeGen_Version extends CRM_Core_CodeGen_BaseTask {
   public function run() {
     echo "Generating civicrm-version file\n";
 
-    file_put_contents($this->config->tplCodePath . "/CRM/common/version.tpl", $this->config->db_version);
-
     $template = new CRM_Core_CodeGen_Util_Template('php');
     $template->assign('db_version', $this->config->db_version);
     $template->assign('cms', ucwords($this->config->cms));

diff --git a/CRM/Utils/Check/Component/Source.php b/CRM/Utils/Check/Component/Source.php
@@ -50,6 +50,7 @@ public function getRemovedFiles() {
     $files[] = '[civicrm.vendor]/pear/net_smtp/tests';
     $files[] = '[civicrm.vendor]/pear/net_smtp/phpdoc.sh';
     $files[] = '[civicrm.vendor]/phpoffice/phpword/samples';
+    $files[] = '[civicrm.root]/templates/CRM/common/version.tpl';
 
     return $files;
   }

diff --git a/xml/templates/civicrm_version.tpl b/xml/templates/civicrm_version.tpl
@@ -3,11 +3,6 @@
  * Get the CiviCRM version.
  */
 function civicrmVersion( ) {ldelim}
-{include file="../../templates/CRM/common/version.tpl" assign=svnrevision}
   return array( 'version'  => '{$db_version}',
-                'cms'      => '{$cms}',
-                'revision' => '{$svnrevision}', );
+                'cms'      => '{$cms}', );
 {rdelim}
-
-
-