diff --git a/CRM/ConstituentsOnly/BAO/Query.php b/CRM/ConstituentsOnly/BAO/Query.php index 782087a..8b99bce 100644 --- a/CRM/ConstituentsOnly/BAO/Query.php +++ b/CRM/ConstituentsOnly/BAO/Query.php @@ -15,7 +15,7 @@ class CRM_ConstituentsOnly_BAO_Query extends CRM_Contact_BAO_Query_Interface { public function select(&$query) { // hack for profile search $url = CRM_Utils_Array::value('q', $_GET); - if ($url == 'civicrm/profile') { + if (in_array($url, ['civicrm/profile', 'civicrm/contact/search/builder'])) { if (empty($query->_params)) { $query->_params[] = [ 'entryURL', @@ -44,7 +44,7 @@ class CRM_ConstituentsOnly_BAO_Query extends CRM_Contact_BAO_Query_Interface { return; } - if (CRM_Utils_Array::value('civicrm_contact', $query->_tables)) { + if (CRM_Utils_Array::value('civicrm_contact', $query->_tables) && empty($query->_paramLookup['do_not_trade'])) { $query->_where[0][] = "( contact_a.do_not_trade IS NULL OR contact_a.do_not_trade = 0)"; } }