From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 25 Aug 2021 19:55:04 +0000 (+1200)
Subject: E notice fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7808a9a8e63abd936c522d608da362110faacebc;p=civicrm-core.git

E notice fixes
---

diff --git a/templates/CRM/Core/Form/Field.tpl b/templates/CRM/Core/Form/Field.tpl
index 1d59c0e3c3..d6d99d35e1 100644
--- a/templates/CRM/Core/Form/Field.tpl
+++ b/templates/CRM/Core/Form/Field.tpl
@@ -15,7 +15,7 @@
       {$fieldSpec.help}
     {else}''{/if}
     {/capture}{help id=$help.id file=$help.file}{/if}
-    {if $action == 2 && $fieldSpec.is_add_translate_dialog}{include file='CRM/Core/I18n/Dialog.tpl' table=$entityTable field=$fieldName id=$entityID}{/if}
+    {if $action == 2 && !empty($fieldSpec.is_add_translate_dialog)}{include file='CRM/Core/I18n/Dialog.tpl' table=$entityTable field=$fieldName id=$entityID}{/if}
   </td>
   <td>{if !empty($fieldSpec.pre_html_text)}{$fieldSpec.pre_html_text}{/if}{if $form.$fieldName.html}{$form.$fieldName.html}{else}{$fieldSpec.place_holder}{/if}{if !empty($fieldSpec.post_html_text)}{$fieldSpec.post_html_text}{/if}<br />
     {if !empty($fieldSpec.description)}<span class="description">{$fieldSpec.description}</span>{/if}
diff --git a/templates/CRM/Form/basicFormFields.tpl b/templates/CRM/Form/basicFormFields.tpl
index a884f4ff3d..ada6e58dab 100644
--- a/templates/CRM/Form/basicFormFields.tpl
+++ b/templates/CRM/Form/basicFormFields.tpl
@@ -12,7 +12,7 @@
 
   {foreach from=$fields item=fieldSpec}
     {assign var=fieldName value=$fieldSpec.name}
-    <tr class="crm-{$entityInClassFormat}-form-block-{$fieldName}">
+    <tr class="crm-{if !empty($entityInClassFormat)}{$entityInClassFormat}{/if}-form-block-{$fieldName}">
       {include file="CRM/Core/Form/Field.tpl"}
     </tr>
   {/foreach}