From: Coleman Watts Date: Thu, 7 Apr 2016 20:34:39 +0000 (-0400) Subject: CRM-18379 - Fix custom date fields in profiles X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c72bf2032b55db5a41f2b5c478e7e81f71656e3a;p=civicrm-core.git 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 ccbd5c7583..adc17e86a0 100644 --- 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}