From 7c9cdbb7324ca7a81053681f95951f1c6b245f0a Mon Sep 17 00:00:00 2001 From: Dave Greenberg Date: Tue, 10 Nov 2015 13:05:33 -0800 Subject: [PATCH] CRM-14732 - Activities where all target contacts are in trash should not be returned by activity search. ---------------------------------------- * CRM-14732: Search returns activities from Contacts in Trash https://issues.civicrm.org/jira/browse/CRM-14732 --- CRM/Activity/BAO/Query.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php index 41cde09c5c..5b87b93fbd 100644 --- a/CRM/Activity/BAO/Query.php +++ b/CRM/Activity/BAO/Query.php @@ -356,7 +356,9 @@ class CRM_Activity_BAO_Query { $from .= " INNER JOIN civicrm_activity ON ( civicrm_activity.id = civicrm_activity_contact.activity_id AND civicrm_activity.is_deleted = 0 AND civicrm_activity.is_current_revision = 1 )"; - + // Do not show deleted contact's activity + $from .= " INNER JOIN civicrm_contact + ON ( civicrm_activity_contact.contact_id = civicrm_contact.id and civicrm_contact.is_deleted != 1 )"; break; case 'activity_status': -- 2.25.1