From d32858b8f9ff1ddc5229bfb7ec0a10931eda6c57 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 28 May 2014 18:59:44 +0100
Subject: [PATCH] Fix smarty crmDate function as used on frozen fields

---
 templates/CRM/Activity/Form/Activity.tpl       | 2 +-
 templates/CRM/Contribute/Form/Contribution.tpl | 2 +-
 templates/CRM/Event/Form/Participant.tpl       | 2 +-
 templates/CRM/Grant/Form/Grant.tpl             | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index ae3021e18b..4436b894e9 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -135,7 +135,7 @@
     {if $action neq 4}
       <td class="view-value">{include file="CRM/common/jcalendar.tpl" elementName=activity_date_time}</td>
       {else}
-      <td class="view-value">{$form.activity_date_time.html|crmDate}</td>
+      <td class="view-value">{$form.activity_date_time.value|crmDate}</td>
     {/if}
   </tr>
   <tr class="crm-activity-form-block-duration">
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 7c5597dac5..fbcba784b3 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -203,7 +203,7 @@
                 {if $hideCalendar neq true}
                   {include file="CRM/common/jcalendar.tpl" elementName=cancel_date}
                 {else}
-                  {$form.cancel_date.html|crmDate}
+                  {$form.cancel_date.value|crmDate}
                 {/if}
               </td>
             </tr>
diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index 1ffc8bd808..c08bfe874b 100644
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -281,7 +281,7 @@
               {if $hideCalendar neq true}
                     {include file="CRM/common/jcalendar.tpl" elementName=register_date}
                   {else}
-                    {$form.register_date.html|crmDate}
+                    {$form.register_date.value|crmDate}
                   {/if}
             </td>
           </tr>
diff --git a/templates/CRM/Grant/Form/Grant.tpl b/templates/CRM/Grant/Form/Grant.tpl
index a2e00235a0..ac5cf62769 100644
--- a/templates/CRM/Grant/Form/Grant.tpl
+++ b/templates/CRM/Grant/Form/Grant.tpl
@@ -78,7 +78,7 @@
          <td>{if $hideCalendar neq true}
                       {include file="CRM/common/jcalendar.tpl" elementName=application_received_date}
                    {else}
-                      {$form.application_received_date.html|crmDate}
+                      {$form.application_received_date.value|crmDate}
                    {/if}</td>
       </tr>
       <tr class="crm-grant-form-block-decision_date">
@@ -86,7 +86,7 @@
          <td>{if $hideCalendar neq true}
                       {include file="CRM/common/jcalendar.tpl" elementName=decision_date}
                    {else}
-                      {$form.decision_date.html|crmDate}
+                      {$form.decision_date.value|crmDate}
                    {/if}<br />
                    <span class="description">{ts}Date on which the grant decision was finalized.{/ts}</span></td>
       </tr>
@@ -94,14 +94,14 @@
         <td>{if $hideCalendar neq true}
                        {include file="CRM/common/jcalendar.tpl" elementName=money_transfer_date}
                     {else}
-                       {$form.money_transfer_date.html|crmDate}
+                       {$form.money_transfer_date.value|crmDate}
                     {/if}<br /><span class="description">{ts}Date on which the grant money was transferred.{/ts}</span></td>
       </tr>
       <tr class="crm-grant-form-block-grant_due_date"><td class="label">{$form.grant_due_date.label}</td>
     <td>{if $hideCalendar neq true}
                        {include file="CRM/common/jcalendar.tpl" elementName=grant_due_date}
                     {else}
-                       {$form.grant_due_date.html|crmDate}
+                       {$form.grant_due_date.value|crmDate}
                     {/if}</td>
       </tr>
       <tr class="crm-grant-form-block-grant_report_received">
-- 
2.25.1