CRM-12274

diff --git a/CRM/Utils/Migrate/ExportJSON.php b/CRM/Utils/Migrate/ExportJSON.php
index f7e5ca30ff11634f88d750ef7cf11dbb5c1856cc..0a4c64fb3d49ae34f2813de6d51fe8318e2f39df 100644 (file)
--- 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 )
 )
 ";