From e8d8851690547821646f69fe4cfc27a529896614 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 22 Aug 2022 11:02:01 +1200
Subject: [PATCH] Enotice & markup fixes to GeoCode, Postal blocks

---
 .../Form/Edit/Address/city_postal_code.tpl    |  2 +-
 .../Contact/Form/Edit/Address/geo_code.tpl    | 25 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl b/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl
index 1742f5c8f6..55a9b5b985 100644
--- a/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl
+++ b/templates/CRM/Contact/Form/Edit/Address/city_postal_code.tpl
@@ -21,7 +21,7 @@
           {$form.address.$blockId.postal_code.label}<br />
           {$form.address.$blockId.postal_code.html}
        </td>
-      {if !empty($form.address.$blockId.postal_code_suffix)}
+      {if array_key_exists('postal_code_suffix', $form.address.$blockId)}
           <td>
             {$form.address.$blockId.postal_code_suffix.label} {help id="id-postal-code-suffix" file="CRM/Contact/Form/Contact.hlp"}<br/>
             {$form.address.$blockId.postal_code_suffix.html}
diff --git a/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl b/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl
index 962030e03a..7db93a3d5b 100644
--- a/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl
+++ b/templates/CRM/Contact/Form/Edit/Address/geo_code.tpl
@@ -7,20 +7,19 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{if !empty($form.address.$blockId.geo_code_1) && !empty($form.address.$blockId.geo_code_2)}
-   <tr>
+{if array_key_exists('geo_code_1', $form.address.$blockId) && array_key_exists('geo_code_2', $form.address.$blockId)}
+  <tr>
+    <td colspan="2">
+      {$form.address.$blockId.geo_code_1.label},&nbsp;{$form.address.$blockId.geo_code_2.label} {help id="id-geo-code" file="CRM/Contact/Form/Contact.hlp"}<br />
+      {$form.address.$blockId.geo_code_1.html},&nbsp;{$form.address.$blockId.geo_code_2.html}<br />
+    </td>
+  </tr>
+  {if array_key_exists('manual_geo_code', $form.address.$blockId)}
+    <tr>
       <td colspan="2">
-          {$form.address.$blockId.geo_code_1.label},&nbsp;{$form.address.$blockId.geo_code_2.label} {help id="id-geo-code" file="CRM/Contact/Form/Contact.hlp"}<br />
-          {$form.address.$blockId.geo_code_1.html},&nbsp;{$form.address.$blockId.geo_code_2.html}<br />
+        {$form.address.$blockId.manual_geo_code.html}
+        {$form.address.$blockId.manual_geo_code.label} {help id="id-geo-code-override" file="CRM/Contact/Form/Contact.hlp"}
       </td>
     </tr>
-    {if !empty($form.address.$blockId.manual_geo_code)}
-     <tr>
-        <td colspan="2">
-          {$form.address.$blockId.manual_geo_code.html}
-          {$form.address.$blockId.manual_geo_code.label} {help id="id-geo-code-override" file="CRM/Contact/Form/Contact.hlp"}
-        </td>
-      </tr>
-    {/if}
-   </tr>
+  {/if}
 {/if}
-- 
2.25.1