From b691052b08c449c800524b1c9b0b37793f2789eb Mon Sep 17 00:00:00 2001 From: monishdeb Date: Tue, 30 Jun 2015 12:52:20 +0530 Subject: [PATCH] minor fix --- CRM/Core/Form/Renderer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php index a28b4ddab1..216408ce76 100644 --- a/CRM/Core/Form/Renderer.php +++ b/CRM/Core/Form/Renderer.php @@ -121,8 +121,9 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty { $this->renderFrozenEntityRef($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 . ''; + list($date, $time) = CRM_Utils_Date::setDateDefaults($element->getValue(), $element->getAttribute('formatType'), $element->getAttribute('format'), $element->getAttribute('timeformat')); + $date .= ($element->getAttribute('timeformat')) ? " $time" : ''; + $el['html'] = $date . ''; } $el['html'] = '' . $el['html'] . ''; -- 2.25.1