CRM-18358: js break when custom date field included in 'On behalf' and 'Honor' Profile

diff --git a/templates/CRM/UF/Form/Block.tpl b/templates/CRM/UF/Form/Block.tpl
index 1fe71fdb580696c6745a7628cca80295c3117942..ccbd5c7583e0257d5634b3c473fb85132a6ba1a6 100644 (file)
--- a/templates/CRM/UF/Form/Block.tpl
+++ b/templates/CRM/UF/Form/Block.tpl
@@ -120,7 +120,7 @@
                 {include file="CRM/Profile/Form/GreetingType.tpl"}
               {elseif ($n eq 'group' && $form.group) || ($n eq 'tag' && $form.tag)}
                 {include file="CRM/Contact/Form/Edit/TagsAndGroups.tpl" type=$n title=null context="profile"}
-              {elseif ( ( $field.data_type eq 'Date' ) or
+              {elseif ((( $field.data_type eq 'Date' ) AND !$prefix) or
                 ( $n|substr:-5:5 eq '_date' ) ) AND
               ( $form.formName neq 'Confirm' )  AND
               ( $form.formName neq 'ThankYou' ) }