Merge pull request #22484 from civicrm/5.46

5.46 to master
civicrm · Jan 12, 2022 · abeb856 · abeb856
2 parents 75b5ef5 + 19d9630
commit abeb856
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
@@ -2728,10 +2728,16 @@ public static function getCountComponent($component, $contactId, $tableName = NU
         return CRM_Core_BAO_Note::getContactNoteCount($contactId);
 
       case 'contribution':
-        return CRM_Contribute_BAO_Contribution::contributionCount($contactId);
+        if (array_key_exists('CiviContribute', CRM_Core_Component::getEnabledComponents())) {
+          return CRM_Contribute_BAO_Contribution::contributionCount($contactId);
+        }
+        return FALSE;
 
       case 'membership':
-        return CRM_Member_BAO_Membership::getContactMembershipCount((int) $contactId, TRUE);
+        if (array_key_exists('CiviMember', CRM_Core_Component::getEnabledComponents())) {
+          return CRM_Member_BAO_Membership::getContactMembershipCount((int) $contactId, TRUE);
+        }
+        return FALSE;
 
       case 'participant':
         return CRM_Event_BAO_Participant::getContactParticipantCount($contactId);

diff --git a/templates/CRM/Block/FullTextSearch.tpl b/templates/CRM/Block/FullTextSearch.tpl
@@ -25,7 +25,7 @@
     <form method="post" id="id_fulltext_search">
     <div style="margin-bottom: 8px;">
     <input type="text" name="text" id='text' value="" class="crm-form-text" />
-    <input type="hidden" name="qfKey" value="{crmKey name='CRM_Contact_Controller_Search' addSequence=1}" />
+    <input type="hidden" name="qfKey" value="{crmKey name='CRM_Legacycustomsearches_Controller_Search' addSequence=1}" />
   </div>
   <select class="form-select" id="fulltext_table" name="fulltext_table">
 {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))}