From: Dave Greenberg <dave@civicrm.org>
Date: Tue, 10 Nov 2015 21:07:29 +0000 (-0800)
Subject: CRM-14732 - Activities where all target contacts are in trash should not be returned... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=db54182d63754bb3223261f3ca1fe886b44dbd5e;p=civicrm-core.git

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
---

diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index 5b87b93fbd..26226e972a 100644
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -356,7 +356,7 @@ 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
+        // 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;