Only run value through format_date if no render_func was called before

12 years ago · c388257078
parent 479af90579
commit c388257078
1 changed files with 3 additions and 2 deletions
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@ -616,10 +616,11 @@ function rcmail_contact_form($form, $record, $attrib = null)
                        if ($colprop['subtypes'] || $colprop['limit'] != 1)
                            $colprop['array'] = true;

-                        // load jquery UI datepickert for date fields
+                        // load jquery UI datepicker for date fields
                        if ($colprop['type'] == 'date') {
                            $colprop['class'] .= ($colprop['class'] ? ' ' : '') . 'datepicker';
-                            $val = rcmail_format_date_col($val);
+                            if (!$colprop['render_func'])
+                                $val = rcmail_format_date_col($val);
                        }

                        $val = rcmail_get_edit_field($col, $val, $colprop, $colprop['type']);