From 5e6373db1fa2f99382362212d1347aebc708c0ba Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 13 Nov 2021 16:01:32 +1300
Subject: [PATCH] Do not check is context is set, should always be

---
 templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl | 4 ++--
 templates/CRM/Form/attachmentjs.tpl               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index deb5e374c5..03c71d3b8e 100644
--- a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -12,7 +12,7 @@
   <div class="crm-accordion-header">{$title}</div>
   <div class="crm-accordion-body" id="tagGroup">
 {/if}
-    <table class="form-layout-compressed{if isset($context) && $context EQ 'profile'} crm-profile-tagsandgroups{/if}">
+    <table class="form-layout-compressed{if $context EQ 'profile'} crm-profile-tagsandgroups{/if}">
       <tr>
         {if empty($type) || $type eq 'tag'}
           <td>
@@ -20,7 +20,7 @@
               {if !empty($title)}{$form.tag.label}<br>{/if}
               {$form.tag.html}
             </div>
-            {if !isset($context) || $context NEQ 'profile'}
+            {if $context NEQ 'profile'}
               {include file="CRM/common/Tagset.tpl"}
             {/if}
           </td>
diff --git a/templates/CRM/Form/attachmentjs.tpl b/templates/CRM/Form/attachmentjs.tpl
index 1734fff151..378aaf1919 100644
--- a/templates/CRM/Form/attachmentjs.tpl
+++ b/templates/CRM/Form/attachmentjs.tpl
@@ -15,7 +15,7 @@
         request.done(function() {
           $el.trigger('crmPopupFormSuccess');
           $row.remove();
-          {/literal}{if isset($context) and $context EQ 'MessageTemplate'}{literal}
+          {/literal}{if $context EQ 'MessageTemplate'}{literal}
             $('#file_id').show();
           {/literal}{/if}{literal}
         });
-- 
2.25.1