From 7701d5790948732a43373c292eb85ce253fbb2ed Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 11 Nov 2021 10:52:17 +1300
Subject: [PATCH] Ensure contactTag is always set

---
 CRM/Contact/Page/View/Summary.php           | 6 ++----
 templates/CRM/Contact/Page/Inline/Basic.tpl | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CRM/Contact/Page/View/Summary.php b/CRM/Contact/Page/View/Summary.php
index a59de8a3a2..9b995c2741 100644
--- a/CRM/Contact/Page/View/Summary.php
+++ b/CRM/Contact/Page/View/Summary.php
@@ -201,10 +201,8 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View {
     $defaults['contact_type_label'] = CRM_Contact_BAO_ContactType::contactTypePairs(TRUE, $contactType, ', ');
 
     // get contact tags
-    $contactTags = CRM_Core_BAO_EntityTag::getContactTags($this->_contactId);
-
-    if (!empty($contactTags)) {
-      $defaults['contactTag'] = $contactTags;
+    $defaults['contactTag'] = CRM_Core_BAO_EntityTag::getContactTags($this->_contactId);
+    if (!empty($defaults['contactTag'])) {
       $defaults['allTags'] = CRM_Core_BAO_Tag::getTagsUsedFor('civicrm_contact', FALSE);
     }
 
diff --git a/templates/CRM/Contact/Page/Inline/Basic.tpl b/templates/CRM/Contact/Page/Inline/Basic.tpl
index ac9bc24cf3..6da2613464 100644
--- a/templates/CRM/Contact/Page/Inline/Basic.tpl
+++ b/templates/CRM/Contact/Page/Inline/Basic.tpl
@@ -5,13 +5,11 @@
          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">
-- 
2.25.1