From 5b1ba2b87c15ad2e1ef69093fa52966620a0d8f4 Mon Sep 17 00:00:00 2001
From: Jamie McClelland <jm@mayfirst.org>
Date: Tue, 19 Nov 2013 14:43:36 -0500
Subject: [PATCH] ensure activity reports with custom fields work properly.

See http://issues.civicrm.org/jira/browse/CRM-13715
---
 CRM/Report/Form/Activity.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php
index 8a37820c04..961e1b274d 100644
--- a/CRM/Report/Form/Activity.php
+++ b/CRM/Report/Form/Activity.php
@@ -568,6 +568,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form {
     // 1. fill temp table with target results
     $this->select('target');
     $this->from('target');
+    $this->customDataFrom();
     $this->where('target');
     $insertCols = implode(',', $this->_selectAliases);
     $tempQuery  = "CREATE TEMPORARY TABLE civireport_activity_temp_target CHARACTER SET utf8 COLLATE utf8_unicode_ci AS
@@ -592,6 +593,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form {
       CRM_Utils_Array::value("contact_assignee_value", $this->_params)) {
       $this->select('assignee');
       $this->from('assignee');
+      $this->customDataFrom();
       $this->where('assignee');
       $insertCols = implode(',', $this->_selectAliases);
       $tempQuery  = "INSERT INTO civireport_activity_temp_target ({$insertCols})
@@ -606,6 +608,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form {
       CRM_Utils_Array::value("contact_source_value", $this->_params)) {
       $this->select('source');
       $this->from('source');
+      $this->customDataFrom();
       $this->where('source');
       $insertCols = implode(',', $this->_selectAliases);
       $tempQuery  = "INSERT INTO civireport_activity_temp_target ({$insertCols})
-- 
2.25.1