From 2076c0d2b0dbbf9df56c3911ad57c32964a9db51 Mon Sep 17 00:00:00 2001
From: Vangelis Pantazis <v.pantazis@ixiam.com>
Date: Fri, 25 Oct 2019 09:23:59 +0100
Subject: [PATCH] Fixes output if location type is primary

---
 CRM/Core/BAO/UFGroup.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
index a2bca83501..5efead4545 100644
--- a/CRM/Core/BAO/UFGroup.php
+++ b/CRM/Core/BAO/UFGroup.php
@@ -2445,6 +2445,13 @@ AND    ( entity_id IS NULL OR entity_id <= 0 )
                     }
                   }
                 }
+                else {
+                  if (substr($fieldName, 0, 14) === 'address_custom' &&
+                    CRM_Utils_Array::value(substr($fieldName, 8), $value)
+                  ) {
+                    $defaults[$fldName] = self::reformatProfileDefaults($field, $value[substr($fieldName, 8)]);
+                  }
+                }
               }
             }
           }
-- 
2.25.1