Merge pull request #314 from pratik-joshi/CRM-12217

CRM-12217 fix : the sixth parameter for getFieldsForImport function was ...

CRM/Core/BAO/UFField.php

@@ -865,8 +865,7 @@ SELECT  id
     $subTypes = CRM_Contact_BAO_ContactType::subTypeInfo();
     foreach ($subTypes as $name => $val) {
       //custom fields for sub type
-      $subTypeFields = CRM_Core_BAO_CustomField::getFieldsForImport($name);
-
+      $subTypeFields = CRM_Core_BAO_CustomField::getFieldsForImport($name, FALSE, FALSE, FALSE, TRUE, TRUE);
       if (array_key_exists($val['parent'], $fields)) {
         $fields[$name] = $fields[$val['parent']] + $subTypeFields;
       }