From d27fc60010d87973f03bb98e95849eaf1cfb4f5d Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 25 Feb 2022 12:17:38 +1300
Subject: [PATCH] Enotice fix

---
 templates/CRM/Contact/Form/Domain.tpl                    | 2 +-
 templates/CRM/Contact/Form/Edit/Address.tpl              | 2 +-
 templates/CRM/Contact/Form/Edit/Address/address_name.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/CRM/Contact/Form/Domain.tpl b/templates/CRM/Contact/Form/Domain.tpl
index 258107b9b8..ed1044c78f 100644
--- a/templates/CRM/Contact/Form/Domain.tpl
+++ b/templates/CRM/Contact/Form/Domain.tpl
@@ -31,7 +31,7 @@
 
     <h3>{ts}Default Organization Address{/ts}</h3>
         <div class="description">{ts 1=&#123;domain.address&#125;}CiviMail mailings must include the sending organization's address. This is done by putting the %1 token in either the body or footer of the mailing. This token may also be used in regular 'Email - send now' messages and in other Message Templates. The token is replaced by the address entered below when the message is sent.{/ts}</div>
-        {include file="CRM/Contact/Form/Edit/Address.tpl"}
+        {include file="CRM/Contact/Form/Edit/Address.tpl" masterAddress='' parseStreetAddress=''}
     <h3>{ts}Organization Contact Information{/ts}</h3>
         <div class="description">{ts}You can also include general email and/or phone contact information in mailings.{/ts} {help id="additional-contact"}</div>
         <table class="form-layout-compressed">
diff --git a/templates/CRM/Contact/Form/Edit/Address.tpl b/templates/CRM/Contact/Form/Edit/Address.tpl
index ebb535da76..42699f2f36 100644
--- a/templates/CRM/Contact/Form/Edit/Address.tpl
+++ b/templates/CRM/Contact/Form/Edit/Address.tpl
@@ -11,7 +11,7 @@
 {* @var $form Contains the array for the form elements and other form associated information assigned to the template by the controller*}
 {* @var $blockId Contains the current address block id, and assigned in the  CRM/Contact/Form/Location.php file *}
 
-{if $title and $className eq 'CRM_Contact_Form_Contact'}
+{if $className eq 'CRM_Contact_Form_Contact' && $title}
 <div id="addressBlockId" class="crm-accordion-wrapper crm-address-accordion collapsed">
  <div class="crm-accordion-header">
     {$title}
diff --git a/templates/CRM/Contact/Form/Edit/Address/address_name.tpl b/templates/CRM/Contact/Form/Edit/Address/address_name.tpl
index 37580b7164..45b2ff3dcb 100644
--- a/templates/CRM/Contact/Form/Edit/Address/address_name.tpl
+++ b/templates/CRM/Contact/Form/Edit/Address/address_name.tpl
@@ -7,7 +7,7 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{if !empty($form.address.$blockId.name)}
+{if array_key_exists('name', $form.address.$blockId)}
   <tr>
       <td colspan="2">
         {$form.address.$blockId.name.label} {help id="id-address-name" file="CRM/Contact/Form/Contact.hlp"}<br />
-- 
2.25.1