CRM-14588 fix - Non Local Date format used in membership thank you and confirm contri...

https://issues.civicrm.org/jira/browse/CRM-14588

diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php
index ca9967de0bd97ba25fb8c94abf6a11ff82c175b0..a28b4ddab16ff9bf069380ae9e5cc155dcd794b1 100644 (file)
--- a/CRM/Core/Form/Renderer.php
+++ b/CRM/Core/Form/Renderer.php
@@ -120,8 +120,9 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
       if ($element->getAttribute('data-api-entity') && $element->getAttribute('data-entity-value')) {
         $this->renderFrozenEntityRef($el, $element);
       }
-      elseif ($element->getAttribute('type') == 'text' && $element->getAttribute('format')) {
-        $this->renderFrozenDate($el, $element);
+      elseif ($element->getAttribute('type') == 'text' && $element->getAttribute('formatType')) {
+        list($date, $time) = CRM_Utils_Date::setDateDefaults($element->getValue(), $element->getAttribute('formatType'), $element->getAttribute('timeformat'));
+        $el['html'] = $date . ' ' . $time . '<input type="hidden" value="' . $element->getValue() . '" name="' . $element->getAttribute('name') . '">';
       }
 
       $el['html'] = '<span class="crm-frozen-field">' . $el['html'] . '</span>';
@@ -264,24 +265,6 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
     $el['html'] = implode('; ', $display) . '<input type="hidden" value="' . $field->getValue() . '" name="' . $field->getAttribute('name') . '">';
   }
 
-  /**
-   * Render a date field as text.
-   *
-   * @param array $el
-   * @param HTML_QuickForm_element $field
-   */
-  public function renderFrozenDate(&$el, $field) {
-    $format = $field->getAttribute('format');
-    $map = CRM_Core_SelectValues::datePluginToPHPFormats($format);
-
-    if (isset($map[$format])) {
-      $format = $map[$format];
-    }
-
-    $date = DateTime::createFromFormat('d/m/Y', $field->getValue());
-    $el['html'] = $date->format($format) . '<input type="hidden" value="' . $field->getValue() . '" name="' . $field->getAttribute('name') . '">';
-  }
-
   /**
    * Pre-fill contact name for a custom field of type ContactReference
    *