From 16487b45546362cad5caf64a1d2e88c5f30b78ce Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 30 Aug 2021 13:24:13 -0400
Subject: [PATCH] Fix undefined smarty vars in Advanced Search

---
 CRM/Contact/Form/Search/Criteria.php                   |  4 ++--
 templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl |  6 +++---
 templates/CRM/Contact/Form/Search/Criteria/Basic.tpl   | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 6bcad01d86..38bd2cc156 100644
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -335,7 +335,7 @@ class CRM_Contact_Form_Search_Criteria {
       'tag_types_text' => ['name' => 'tag_types_text'],
       'tag_search' => [
         'name' => 'tag_search',
-        'help' => ['id' => 'id-all-tags'],
+        'help' => ['id' => 'id-all-tags', 'file' => NULL],
       ],
       'tag_set' => [
         'name' => 'tag_set',
@@ -345,7 +345,7 @@ class CRM_Contact_Form_Search_Criteria {
       'all_tag_types' => [
         'name' => 'all_tag_types',
         'class' => 'search-field__span-3 search-field__checkbox',
-        'help' => ['id' => 'id-all-tag-types'],
+        'help' => ['id' => 'id-all-tag-types', 'file' => NULL],
       ],
       'phone_numeric' => [
         'name' => 'phone_numeric',
diff --git a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index 8c7807c4b0..3dbdecafc3 100644
--- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -76,11 +76,11 @@ CRM.$(function($) {
 </script>
 {/literal}
 
-{if $context EQ 'smog' || $context EQ 'amtg' || $savedSearch}
+{if $context EQ 'smog' || $context EQ 'amtg' || !empty($savedSearch)}
   <h3>
     {if $context EQ 'smog'}{ts}Find Contacts within this Group{/ts}
     {elseif $context EQ 'amtg'}{ts}Find Contacts to Add to this Group{/ts}
-    {elseif $savedSearch}{ts 1=$savedSearch.name}%1 Smart Group Criteria{/ts} &nbsp; {help id='id-advanced-smart'}
+    {elseif !empty($savedSearch)}{ts 1=$savedSearch.name}%1 Smart Group Criteria{/ts} &nbsp; {help id='id-advanced-smart'}
     {/if}
   </h3>
 {/if}
@@ -111,7 +111,7 @@ CRM.$(function($) {
     </div>
   </div>
   {foreach from=$allPanes key=paneName item=paneValue}
-    <div class="crm-accordion-wrapper crm-ajax-accordion crm-{$paneValue.id}-accordion {if $paneValue.open eq 'true' || $openedPanes.$paneName} {else}collapsed{/if}">
+    <div class="crm-accordion-wrapper crm-ajax-accordion crm-{$paneValue.id}-accordion {if $paneValue.open eq 'true' || !empty($openedPanes.$paneName)} {else}collapsed{/if}">
       <div class="crm-accordion-header" id="{$paneValue.id}">
         {$paneName}
       </div>
diff --git a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
index 8c1a39568c..2f605153cd 100644
--- a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
@@ -11,26 +11,26 @@
   {foreach from=$basicSearchFields item=fieldSpec}
     {assign var=field value=$form[$fieldSpec.name]}
     {if $field && !in_array($fieldSpec.name, array('first_name', 'last_name'))}
-      <div class="search-field {$fieldSpec.class|escape}">
-        {if $fieldSpec.template}
+      <div class="search-field {if !empty($fieldSpec.class)}{$fieldSpec.class|escape}{/if}">
+        {if !empty($fieldSpec.template)}
           {include file=$fieldSpec.template}
         {else}
           {$field.label}
-          {if $fieldSpec.help}
+          {if !empty($fieldSpec.help)}
             {assign var=help value=$fieldSpec.help}
             {capture assign=helpFile}{if $fieldSpec.help}{$fieldSpec.help}{else}''{/if}{/capture}
             {help id=$help.id file=$help.file}
           {/if}
           <br />
           {$field.html}
-          {if $fieldSpec.description}
+          {if !empty($fieldSpec.description)}
             <div class="description font-italic">
               {$fieldSpec.description}
             </div>
           {/if}
         {/if}
       </div>
-    {elseif $fieldSpec.is_custom}
+    {elseif !empty($fieldSpec.is_custom)}
       {include file=$fieldSpec.template}
     {/if}
   {/foreach}
-- 
2.25.1