X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=civicrm-version.php;h=243416452f3e7c9837200a9455f504faee19c0e8;hb=a2461068ad4266d7f0206786efcf04f472204ce6;hp=f99d34cad70bd6b69289399e02351eb58e495029;hpb=865168d5d056d071d23d0273189051241c5261e5;p=civicrm-core.git diff --git a/civicrm-version.php b/civicrm-version.php index f99d34cad7..243416452f 100644 --- 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(), ]; } + }