From 671dcd9ae5002e98730a6696cf8b9965c2b56f63 Mon Sep 17 00:00:00 2001 From: yashodha Date: Thu, 11 Apr 2013 23:17:53 +0530 Subject: [PATCH] CRM-12274 --- CRM/Utils/Migrate/ExportJSON.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CRM/Utils/Migrate/ExportJSON.php b/CRM/Utils/Migrate/ExportJSON.php index f7e5ca30ff..0a4c64fb3d 100644 --- a/CRM/Utils/Migrate/ExportJSON.php +++ b/CRM/Utils/Migrate/ExportJSON.php @@ -379,14 +379,14 @@ AND entity_table = 'civicrm_contact' $sql = "( SELECT a.* FROM civicrm_activity a - INNER JOIN civicrm_activity_assignment aa ON aa.activity_id = a.id - WHERE aa.assignee_contact_id IN ( $ids ) + INNER JOIN civicrm_activity_contact aa ON aa.activity_id = a.id AND aa.record_type = 'Assignee' + WHERE aa.contact_id IN ( $ids ) AND ( a.activity_type_id != 3 AND a.activity_type_id != 20 ) ) UNION ( SELECT a.* FROM civicrm_activity a - INNER JOIN civicrm_activity_target at ON at.activity_id = a.id - WHERE at.target_contact_id IN ( $ids ) + INNER JOIN civicrm_activity_contact at ON at.activity_id = a.id AND at.record_type = 'Target' + WHERE at.contact_id IN ( $ids ) AND ( a.activity_type_id != 3 AND a.activity_type_id != 20 ) ) "; -- 2.25.1