From 6db99d8669ac8ba5460b33e99c0509e910c02e5e Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 15 Nov 2021 07:31:16 +1300
Subject: [PATCH] Ensure masterAddress is always assigned

---
 CRM/Contact/Form/Edit/Address.php           | 3 +++
 templates/CRM/Contact/Form/Edit/Address.tpl | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CRM/Contact/Form/Edit/Address.php b/CRM/Contact/Form/Edit/Address.php
index 105ef33ce3..6931364f86 100644
--- a/CRM/Contact/Form/Edit/Address.php
+++ b/CRM/Contact/Form/Edit/Address.php
@@ -231,6 +231,9 @@ class CRM_Contact_Form_Edit_Address {
    */
   public static function setDefaultValues(&$defaults, &$form) {
     $addressValues = [];
+    // Actual values will be assigned to these below if there are some.
+    $form->assign('masterAddress');
+    $form->assign('sharedAddresses', []);
     if (isset($defaults['address']) && is_array($defaults['address']) &&
       !CRM_Utils_System::isNull($defaults['address'])
     ) {
diff --git a/templates/CRM/Contact/Form/Edit/Address.tpl b/templates/CRM/Contact/Form/Edit/Address.tpl
index 3c4fc4df1c..ebb535da76 100644
--- a/templates/CRM/Contact/Form/Edit/Address.tpl
+++ b/templates/CRM/Contact/Form/Edit/Address.tpl
@@ -22,7 +22,7 @@
  <div id="Address_Block_{$blockId}" {if $className eq 'CRM_Contact_Form_Contact'} class="boxBlock crm-edit-address-block crm-address_{$blockId}"{/if}>
   {if $blockId gt 1}<fieldset><legend>{ts}Supplemental Address{/ts}</legend>{/if}
   <table class="form-layout-compressed crm-edit-address-form">
-     {if isset($masterAddress) && $masterAddress.$blockId gt 0 }
+     {if $masterAddress && $masterAddress.$blockId gt 0 }
         <tr><td><div class="message status">{icon icon="fa-info-circle"}{/icon} {ts 1=$masterAddress.$blockId}This address is shared with %1 contact record(s). Modifying this address will automatically update the shared address for these contacts.{/ts}</div></td></tr>
      {/if}
 
-- 
2.25.1