From: Jaap Jansma <jaap@edeveloper.nl>
Date: Fri, 20 Nov 2015 12:48:15 +0000 (+0100)
Subject: fixed #CRM-17382
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e75182f213f39f85a41a043fc384e508fe8034c2;p=civicrm-core.git

fixed #CRM-17382
---

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index f42e030d44..0dd53100ec 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -2205,9 +2205,6 @@ AND cl.modified_id  = c.id
             'type' => CRM_Utils_Type::T_BOOLEAN,
           ),
         );
-
-        // add custom data for cases
-        $fields = array_merge($fields, CRM_Core_BAO_CustomField::getFieldsForImport('Case'));
       }
 
       // add custom data for case activities
diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 3b53743b30..e83a961595 100644
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -1741,6 +1741,9 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c
         'name' => 'case_status',
       );
 
+      // add custom data for cases
+      $fields = array_merge($fields, CRM_Core_BAO_CustomField::getFieldsForImport('Case'));
+
       self::$_exportableFields = $fields;
     }
     return self::$_exportableFields;