E notice fixes

diff --git a/templates/CRM/Core/Form/Field.tpl b/templates/CRM/Core/Form/Field.tpl
index 1d59c0e3c3f675c3a0f0e55e46d69ac0c1dea85b..d6d99d35e1f86eb62b6a87f123d64761ea3ff562 100644 (file)
--- 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 a884f4ff3d360c25dda12c71a362ed6d36b2636f..ada6e58dab09e3eb5b229ad1f54d3e733938e636 100644 (file)
--- 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}