From 1be099c7876267916fbb9fba430a69bba8c01837 Mon Sep 17 00:00:00 2001
From: monishdeb <monish.deb@webaccessglobal.com>
Date: Fri, 13 Mar 2015 13:59:35 +0530
Subject: [PATCH] CRM-16102 fix - Thows validation error on adding any
 'Contact' field if the profile has any 'Subtype' field

https://issues.civicrm.org/jira/browse/CRM-16102
---
 CRM/UF/Form/Field.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php
index dec747e471..270150e2fd 100644
--- a/CRM/UF/Form/Field.php
+++ b/CRM/UF/Form/Field.php
@@ -652,7 +652,7 @@ class CRM_UF_Form_Field extends CRM_Core_Form {
         if (!is_array($basicType)) {
           $basicType = array($basicType);
         }
-        if (!in_array($fieldType, $basicType)) {
+        if (!in_array($fieldType, $basicType) && $fieldType != 'Contact') {
           $errors['field_name'] = ts('Cannot add or update profile field type "%1" with combination of subtype other than "%1".',
             array(1 => $fieldType)
           );
-- 
2.25.1