From ce56006d71a57964b8f0ed5a36c7305ba5b551a1 Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Thu, 13 Jul 2017 14:05:09 +0530
Subject: [PATCH] CRM-20861 : Location type does not show for custom address
 fields

---
 CRM/UF/Form/Field.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php
index 35bd5f45d2..79ae58d2e5 100644
--- a/CRM/UF/Form/Field.php
+++ b/CRM/UF/Form/Field.php
@@ -196,6 +196,7 @@ class CRM_UF_Form_Field extends CRM_Core_Form {
       ));
       return;
     }
+    $addressCustomFields = array_keys(CRM_Core_BAO_CustomField::getFieldsForImport('Address'));
 
     if (isset($this->_id)) {
       $params = array('id' => $this->_id);
@@ -204,8 +205,7 @@ class CRM_UF_Form_Field extends CRM_Core_Form {
       // set it to null if so (avoids crappy E_NOTICE errors below
       $defaults['location_type_id'] = CRM_Utils_Array::value('location_type_id', $defaults);
 
-      $specialFields = CRM_Core_BAO_UFGroup::getLocationFields();
-
+      $specialFields = array_merge(CRM_Core_BAO_UFGroup::getLocationFields(), $addressCustomFields);
       if (!$defaults['location_type_id'] &&
         $defaults["field_type"] != "Formatting" &&
         in_array($defaults['field_name'], $specialFields)
@@ -245,7 +245,6 @@ class CRM_UF_Form_Field extends CRM_Core_Form {
     $fields = CRM_Core_BAO_UFField::getAvailableFields($this->_gid, $defaults);
 
     $noSearchable = $hasWebsiteTypes = array();
-    $addressCustomFields = array_keys(CRM_Core_BAO_CustomField::getFieldsForImport('Address'));
 
     foreach ($fields as $key => $value) {
       foreach ($value as $key1 => $value1) {
-- 
2.25.1