fixed #CRM-17382

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index f42e030d4484d564d63ce3fe1bd7dea8705f361b..0dd53100ecbb5632113146eed4e5f210e7290e6c 100644 (file)
--- 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 3b53743b30463349b130f5574f08838a9c7978d7..e83a961595d68fce3bcb3489aa550c0aa54d6554 100644 (file)
--- 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;