From 7780c3b0c5becbfcc8e3b72981caeeecc22d74d1 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 29 Aug 2023 08:50:50 +1200
Subject: [PATCH] Fix notices on domain.tpl by just adding what we need

---
 templates/CRM/Contact/Form/Domain.tpl     | 13 +++++++++----
 templates/CRM/Contact/Form/Edit/Email.tpl |  1 +
 templates/CRM/Contact/Form/Edit/Phone.tpl |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/templates/CRM/Contact/Form/Domain.tpl b/templates/CRM/Contact/Form/Domain.tpl
index d3d9547eff..08f98ba570 100644
--- a/templates/CRM/Contact/Form/Domain.tpl
+++ b/templates/CRM/Contact/Form/Domain.tpl
@@ -33,10 +33,15 @@
         <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">
             {* Display the email block *}
-            {include file="CRM/Contact/Form/Edit/Email.tpl" blockId=1}
-
-            {* Display the phone block *}
-            {include file="CRM/Contact/Form/Edit/Phone.tpl" blockId=1}
+          <tr>
+            <td>{ts}Email{/ts}</td>
+            <td>{$form.email.1.email.html|crmAddClass:email}</td>
+          </tr>
+          <tr>
+            <td>{ts}Phone{/ts}</td>
+            <td>{$form.phone.1.phone.html}<span class="crm-phone-ext">{ts context="phone_ext"}ext.{/ts}&nbsp;{$form.phone.1.phone_ext.html|crmAddClass:four}&nbsp;</span></td>
+            <td colspan="2">{$form.phone.1.phone_type_id.html}</td>
+          </tr>
         </table>
 
     <div class="spacer"></div>
diff --git a/templates/CRM/Contact/Form/Edit/Email.tpl b/templates/CRM/Contact/Form/Edit/Email.tpl
index b840175155..80d6008cb2 100644
--- a/templates/CRM/Contact/Form/Edit/Email.tpl
+++ b/templates/CRM/Contact/Form/Edit/Email.tpl
@@ -11,6 +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 email block id in evaluation, and assigned in the CRM/Contact/Form/Location.php file *}
 
+{* note this is only called from CRM_Contact_Form_Contact in core so the className if clauses are not needed & should be phased out *}
 {if !$addBlock}
   <tr>
     <td>{ts}Email{/ts}
diff --git a/templates/CRM/Contact/Form/Edit/Phone.tpl b/templates/CRM/Contact/Form/Edit/Phone.tpl
index ff649fc4ba..7e6001697d 100644
--- a/templates/CRM/Contact/Form/Edit/Phone.tpl
+++ b/templates/CRM/Contact/Form/Edit/Phone.tpl
@@ -11,6 +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 block id, and assigned in the CRM/Contact/Form/Location.php file *}
 
+{* note this is only called from CRM_Contact_Form_Contact in core so the className if clauses are not needed & should be phased out *}
 {if !$addBlock}
   <tr>
     <td>{ts}Phone{/ts}</td>
-- 
2.25.1