CRM-18379 - Fix custom date fields in profiles

diff --git a/templates/CRM/UF/Form/Block.tpl b/templates/CRM/UF/Form/Block.tpl
index ccbd5c7583e0257d5634b3c473fb85132a6ba1a6..adc17e86a0125a02ffe1b25609247a46cacb38fb 100644 (file)
--- a/templates/CRM/UF/Form/Block.tpl
+++ b/templates/CRM/UF/Form/Block.tpl
@@ -120,8 +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' ) AND !$prefix) or
-                ( $n|substr:-5:5 eq '_date' ) ) AND
+              {elseif ( $n|substr:-5:5 eq '_date' ) AND
               ( $form.formName neq 'Confirm' )  AND
               ( $form.formName neq 'ThankYou' ) }
                 {include file="CRM/common/jcalendar.tpl" elementName=$n}