Merge pull request #23868 from civicrm/5.51

[civicrm-core.git] / ext / greenwich / greenwich.php

diff --git a/ext/greenwich/greenwich.php b/ext/greenwich/greenwich.php
index 14c312e0a2483ea0ce7a90cdd51ce6e6b1b06b95..5a0fa917ad239182e522c1aed993eff0d503323d 100644 (file)
--- a/ext/greenwich/greenwich.php
+++ b/ext/greenwich/greenwich.php
@@ -14,29 +14,10 @@ function greenwich_civicrm_config(&$config) {
   _greenwich_civix_civicrm_config($config);
 }
 
-///**
-// * Implements hook_civicrm_xmlMenu().
-// *
-// * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
-// */
-//function greenwich_civicrm_xmlMenu(&$files) {
-//  _greenwich_civix_civicrm_xmlMenu($files);
-//}
-
-/**
- * Implements hook_civicrm_alterSettingsFolders().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
- */
-function greenwich_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
-  _greenwich_civix_civicrm_alterSettingsFolders($metaDataFolders);
-}
-
 /**
  * Implements hook_civicrm_themes().
  */
 function greenwich_civicrm_themes(&$themes) {
-  // _greenwich_civix_civicrm_themes($themes);
   $themes['greenwich'] = [
     'ext' => 'civicrm',
     'title' => 'Greenwich',
@@ -56,6 +37,9 @@ function greenwich_civicrm_alterBundle(CRM_Core_Resources_Bundle $bundle) {
       $bundle->addScriptFile('greenwich', 'extern/bootstrap3/assets/javascripts/bootstrap.min.js', [
         'translate' => FALSE,
       ]);
+      $bundle->addScriptFile('greenwich', 'js/noConflict.js', [
+        'translate' => FALSE,
+      ]);
       break;
   }
 }