diff options
| author | thomascube <thomas@roundcube.net> | 2011-05-12 20:18:19 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2011-05-12 20:18:19 +0000 |
| commit | e848180aaa9640de871796ca1a3e4f8110701fd6 (patch) | |
| tree | 8691c816c9c8ddd4ad8ef733cc61a8bc52541cc3 /program/steps/addressbook/func.inc | |
| parent | caedd52361f8ba15aa6bfbc00cab7f55525f5edf (diff) | |
Improve display name composition when saving contacts (#1487143), with plugin-support; allow empty names in sql address book, fall back to e-mail address in listing and vcard export
Diffstat (limited to 'program/steps/addressbook/func.inc')
| -rw-r--r-- | program/steps/addressbook/func.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 837256f89..c36108784 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -346,10 +346,9 @@ function rcmail_contact_form($form, $record, $attrib = null) // render head section with name fields (not a regular list of rows) if ($section == 'head') { $content = ''; - - // TODO: use the save name composition function as in save.inc - $names_arr = array($record['prefix'], $record['firstname'], $record['middlename'], $record['surname'], $record['suffix']); - if ($record['name'] == join(' ', array_filter($names_arr))) + + // unset display name if it is composed from name parts (same composition function as in save.inc) + if ($record['name'] == rcube_addressbook::compose_display_name(array('name' => '') + $record)) unset($record['name']); // group fields |