Solving RT ticket #1092988

[civicrm-core.git] / civicrm-version.php

diff --git a/civicrm-version.php b/civicrm-version.php
index f99d34cad70bd6b69289399e02351eb58e495029..243416452f3e7c9837200a9455f504faee19c0e8 100644 (file)
--- a/civicrm-version.php
+++ b/civicrm-version.php
@@ -29,9 +29,6 @@ namespace _CiviVersion_ {
       elseif (defined('BACKDROP_VERSION')) {
         return 'Backdrop';
       }
-      elseif (function_exists('drupal_bootstrap') && version_compare(VERSION, '6.0', '>=') && version_compare(VERSION, '7.0', '<')) {
-        return 'Drupal6';
-      }
       elseif (function_exists('drupal_bootstrap') && version_compare(VERSION, '7.0', '>=') && version_compare(VERSION, '8.0', '<')) {
         return 'Drupal';
       }
@@ -64,10 +61,12 @@ namespace _CiviVersion_ {
           'administrator/components/com_civicrm/civicrm/civicrm-version.php',
         ),
         'Drupal' => array(
-          'modules/system/system.module', // D7
+          // D7
+          'modules/system/system.module',
         ),
         'Drupal8' => array(
-          'core/core.services.yml', // D8
+          // D8
+          'core/core.services.yml',
         ),
         'Backdrop' => array(
           'core/modules/layout/layout.module',
@@ -112,6 +111,7 @@ namespace _CiviVersion_ {
 }
 
 namespace {
+
   /**
    * Get the CiviCRM version.
    * TODO : For now this function is not included in \Civi\Version class so not to break any code
@@ -125,4 +125,5 @@ namespace {
       'cms' => \_CiviVersion_\Util::findCMS(),
     ];
   }
+
 }