CRM-16137 add support to custom fields from is_multiple custom groups

diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
index 7857c4bfd5c9f7cff9015ed7d5ae517e951120d4..bd8f7abe7ee2acd2e8258cdfc4f6cca2f3ecb33e 100644 (file)
--- a/CRM/Core/BAO/Mapping.php
+++ b/CRM/Core/BAO/Mapping.php
@@ -319,7 +319,12 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
 
     $contactType = array('Individual', 'Household', 'Organization');
     foreach ($contactType as $value) {
-      $contactFields = CRM_Contact_BAO_Contact::exportableFields($value, FALSE, $required);
+      if ($mappingType == 'Search Builder') {
+        // get multiple custom group fields in this context
+        $contactFields = CRM_Contact_BAO_Contact::exportableFields($value, FALSE, $required, FALSE, TRUE);
+      } else {
+        $contactFields = CRM_Contact_BAO_Contact::exportableFields($value, FALSE, $required);
+      }
       $contactFields = array_merge($contactFields, CRM_Contact_BAO_Query_Hook::singleton()->getFields());
 
       // exclude the address options disabled in the Address Settings