Merge pull request #21041 from eileenmcnaughton/notice2

Enotice fix

templates/CRM/Contact/Form/Search/Advanced.tpl

@@ -15,18 +15,12 @@
 
   <div class="crm-accordion-wrapper crm-advanced_search_form-accordion {if !empty($ssID) or $rows}collapsed{/if}">
     <div class="crm-accordion-header crm-master-accordion-header">
-      {if !empty($ssID) or $rows}
-        {if $savedSearch}
-          {ts 1=$savedSearch.name}Edit %1 Smart Group Criteria{/ts}
-        {else}
-          {ts}Edit Search Criteria{/ts}
-        {/if}
+      {if !empty($savedSearch)}
+        {ts 1=$savedSearch.name}Edit %1 Smart Group Criteria{/ts}
+      {elseif !empty($ssID) or $rows}
+        {ts}Edit Search Criteria{/ts}
       {else}
-        {if $savedSearch}
-          {ts 1=$savedSearch.name}Edit %1 Smart Group Criteria{/ts}
-        {else}
-          {ts}Search Criteria{/ts}
-        {/if}
+        {ts}Search Criteria{/ts}
       {/if}
       {help id='id-advanced-intro'}
     </div>