summaryrefslogtreecommitdiff
path: root/program/steps/addressbook/search.inc
diff options
context:
space:
mode:
Diffstat (limited to 'program/steps/addressbook/search.inc')
-rw-r--r--program/steps/addressbook/search.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index 851325070..d153c255a 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -184,7 +184,7 @@ function rcmail_contact_search()
while ($row = $result->next()) {
$row['sourceid'] = $s['id'];
- $key = rcmail_contact_key($row, $sort_col);
+ $key = rcube_addressbook::compose_contact_key($row, $sort_col);
$records[$key] = $row;
}
@@ -300,9 +300,13 @@ function rcmail_contact_search_form($attrib)
$label = isset($colprop['label']) ? $colprop['label'] : rcube_label($col);
$category = $colprop['category'] ? $colprop['category'] : 'other';
- if ($ftype == 'text')
+ // load jquery UI datepicker for date fields
+ if ($colprop['type'] == 'date')
+ $colprop['class'] .= ($colprop['class'] ? ' ' : '') . 'datepicker';
+ else if ($ftype == 'text')
$colprop['size'] = $i_size;
+
$content = html::div('row', html::div('contactfieldlabel label', Q($label))
. html::div('contactfieldcontent', rcmail_get_edit_field('search_'.$col, '', $colprop, $ftype)));