Enotice fix

diff --git a/templates/CRM/Contact/Form/Domain.tpl b/templates/CRM/Contact/Form/Domain.tpl
index 258107b9b8bbd078e91bc486e655d002c972fc0c..ed1044c78f2f04e2a77182691201d4ed9864d7b4 100644 (file)
--- 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 ebb535da76fc61c324b6b998c1d7cea3cedc4c34..42699f2f3632f12ca71e9c3b1e7308081a8dd89d 100644 (file)
--- 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 37580b71649692dd6a7602c2ce7789fb2ac0363c..45b2ff3dcbdcd714d5104aa5e7a21ad265de4e84 100644 (file)
--- 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 />