diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-03-08 09:11:07 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-03-08 09:11:07 +0000 |
| commit | c0ebde5704635fde83d744c56d2d21c4205bf865 (patch) | |
| tree | 63ed2798e7971e79bcdd91fce5a55fd375ae9bb3 | |
| parent | 21b24bd8b5805ef07616fee0380723b2c1383013 (diff) | |
Only run value through format_date if no render_func was called before
git-svn-id: https://svn.roundcube.net/trunk@5980 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/addressbook/func.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/addressbook/func.inc b/roundcubemail/program/steps/addressbook/func.inc index 84796baee..5a7213ca4 100644 --- a/roundcubemail/program/steps/addressbook/func.inc +++ b/roundcubemail/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']); |