diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/addressbook/func.inc | 9 | ||||
| -rw-r--r-- | program/steps/addressbook/save.inc | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index f372c1c33..6b3ebad08 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -294,8 +294,13 @@ function rcmail_js_contacts_list($result, $prefix='') } // format each col - foreach ($a_show_cols as $col) - $a_row_cols[$col] = Q($row[$col]); + foreach ($a_show_cols as $col) { + $val = $row[$col]; + if ($val == '' && $col == 'name') { + $val = rcube_addressbook::compose_display_name($row, true); + } + $a_row_cols[$col] = Q($val); + } $OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols); } diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index a8dd38f27..393eb5145 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -188,8 +188,8 @@ if (!empty($cid)) $a_js_cols = array(); $record = $CONTACTS->get_record($newcid ? $newcid : $cid, true); $record['email'] = reset($CONTACTS->get_col_values('email', $record, true)); - if (!$record['name']) - $record['name'] = $record['email']; + if (empty($record['name'])) + $record['name'] = rcube_addressbook::compose_display_name($record, true); foreach (array('name', 'email') as $col) $a_js_cols[] = Q((string)$record[$col]); |