From 7f371aa963ac739ff29dbbd17d45d0e7e74661fc Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 18 Jun 2021 17:31:21 -0400
Subject: [PATCH] Fix undefined tpl variables on contact summary

---
 templates/CRM/Contact/Page/Inline/Basic.tpl            |  2 ++
 .../Contact/Page/Inline/CommunicationPreferences.tpl   |  2 +-
 templates/CRM/Contact/Page/Inline/ContactInfo.tpl      | 10 +++++-----
 templates/CRM/Contact/Page/Inline/Website.tpl          |  3 ++-
 templates/CRM/Contact/Page/View/Summary.tpl            |  8 ++++----
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/templates/CRM/Contact/Page/Inline/Basic.tpl b/templates/CRM/Contact/Page/Inline/Basic.tpl
index cc9d6cfd8a..3b0bca9ee8 100644
--- a/templates/CRM/Contact/Page/Inline/Basic.tpl
+++ b/templates/CRM/Contact/Page/Inline/Basic.tpl
@@ -5,11 +5,13 @@
          title="{ts}Edit Tags{/ts}">{ts}Tags{/ts}</a>
     </div>
     <div class="crm-content" id="tags">
+      {if !empty($contactTag)}
       {foreach from=$contactTag item=tagName key=tagId}
         <span class="crm-tag-item" {if !empty($allTags.$tagId.color)}style="background-color: {$allTags.$tagId.color}; color: {$allTags.$tagId.color|colorContrast};"{/if} title="{$allTags.$tagId.description|escape}">
           {$tagName}
         </span>
       {/foreach}
+      {/if}
     </div>
   </div>
   <div class="crm-summary-row">
diff --git a/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl b/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl
index 1093e03c92..22fa7db810 100644
--- a/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl
+++ b/templates/CRM/Contact/Page/Inline/CommunicationPreferences.tpl
@@ -30,7 +30,7 @@
         {$preferred_communication_method_display}
       </div>
     </div>
-    {if $preferred_language}
+    {if !empty($preferred_language)}
     <div class="crm-summary-row">
       <div class="crm-label">{ts}Preferred Language{/ts}</div>
       <div class="crm-content crm-contact-preferred_language">
diff --git a/templates/CRM/Contact/Page/Inline/ContactInfo.tpl b/templates/CRM/Contact/Page/Inline/ContactInfo.tpl
index e6f23db339..92ca7fe9fe 100644
--- a/templates/CRM/Contact/Page/Inline/ContactInfo.tpl
+++ b/templates/CRM/Contact/Page/Inline/ContactInfo.tpl
@@ -27,27 +27,27 @@
       </div>
       <div class="crm-summary-row">
         <div class="crm-label">{ts}Job Title{/ts}</div>
-        <div class="crm-content crm-contact-job_title">{$job_title}</div>
+        <div class="crm-content crm-contact-job_title">{if isset($job_title)}{$job_title}{/if}</div>
       </div>
       {/if}
       <div class="crm-summary-row">
         <div class="crm-label">{ts}Nickname{/ts}</div>
-        <div class="crm-content crm-contact-nick_name">{$nick_name}</div>
+        <div class="crm-content crm-contact-nick_name">{if isset($nick_name)}{$nick_name}{/if}</div>
       </div>
 
       {if $contact_type eq 'Organization'}
       <div class="crm-summary-row">
         <div class="crm-label">{ts}Legal Name{/ts}</div>
-        <div class="crm-content crm-contact-legal_name">{$legal_name}</div>
+        <div class="crm-content crm-contact-legal_name">{if isset($legal_name)}{$legal_name}{/if}</div>
       </div>
       <div class="crm-summary-row">
         <div class="crm-label">{ts}SIC Code{/ts}</div>
-        <div class="crm-content crm-contact-sic_code">{$sic_code}</div>
+        <div class="crm-content crm-contact-sic_code">{if isset($sic_code)}{$sic_code}{/if}</div>
       </div>
       {/if}
       <div class="crm-summary-row">
         <div class="crm-label">{ts}Source{/ts}</div>
-        <div class="crm-content crm-contact_source">{$source}</div>
+        <div class="crm-content crm-contact_source">{if isset($source)}{$source}{/if}</div>
       </div>
 
     </div>
diff --git a/templates/CRM/Contact/Page/Inline/Website.tpl b/templates/CRM/Contact/Page/Inline/Website.tpl
index d509655b4d..27bde2283a 100644
--- a/templates/CRM/Contact/Page/Inline/Website.tpl
+++ b/templates/CRM/Contact/Page/Inline/Website.tpl
@@ -20,7 +20,7 @@
         <div class="crm-label">{ts}Website{/ts}</div>
         <div class="crm-content"></div>
       </div>
-    {/if}
+    {else}
     {foreach from=$website item=item}
       {if !empty($item.url)}
       <div class="crm-summary-row">
@@ -29,5 +29,6 @@
       </div>
       {/if}
     {/foreach}
+    {/if}
   </div>
 </div>
diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl
index c9af2ebe84..8eb9fa7130 100644
--- a/templates/CRM/Contact/Page/View/Summary.tpl
+++ b/templates/CRM/Contact/Page/View/Summary.tpl
@@ -23,10 +23,10 @@
       <ul id="actions">
         {crmRegion name="contact-actions-ribbon"}
         {assign var='urlParams' value="reset=1"}
-        {if $searchKey}
+        {if !empty($searchKey)}
           {assign var='urlParams' value=$urlParams|cat:"&key=$searchKey"}
         {/if}
-        {if $context}
+        {if !empty($context)}
           {assign var='urlParams' value=$urlParams|cat:"&context=$context"}
         {/if}
 
@@ -110,11 +110,11 @@
     <div id="mainTabContainer">
       <ul class="crm-contact-tabs-list">
         {foreach from=$allTabs item=tabValue}
-          <li id="tab_{$tabValue.id}" class="crm-tab-button ui-corner-all crm-count-{$tabValue.count}{if isset($tabValue.class)} {$tabValue.class}{/if}">
+          <li id="tab_{$tabValue.id}" class="crm-tab-button ui-corner-all{if isset($tabValue.count)} crm-count-{$tabValue.count}{/if}{if isset($tabValue.class)} {$tabValue.class}{/if}">
             <a href="{if !empty($tabValue.template)}#contact-{$tabValue.id}{else}{$tabValue.url}{/if}" title="{$tabValue.title|escape}">
               <i class="{if $tabValue.icon}{$tabValue.icon}{else}crm-i fa-puzzle-piece{/if}" aria-hidden="true"></i>
               <span>{$tabValue.title}</span>
-              {if empty($tabValue.hideCount)}<em>{$tabValue.count}</em>{/if}
+              {if empty($tabValue.hideCount)}<em>{if isset($tabValue.count)}{$tabValue.count}{/if}</em>{/if}
             </a>
           </li>
         {/foreach}
-- 
2.25.1