Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-05 07:44:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix empty name in search results and error when creating a new contact

Browse Source
This commit is contained in:
thomascube
2011-05-13 17:51:28 +00:00
parent 8e99ffbcac
commit 445a4ca04d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
program/include/rcube_contacts.php
View File

@@ -200,10 +200,13 @@ class rcube_contacts extends rcube_addressbook
$sql_arr = $this->convert_db_data($sql_arr);
else
$sql_arr['email'] = preg_split('/,\s*/', $sql_arr['email']);
// make sure we have a name to display
if (empty($sql_arr['name']))
if (empty($sql_arr['name'])) {
if (empty($sql_arr['email']))
$sql_arr['email'] = $this->get_col_values('email', $sql_arr, true);
$sql_arr['name'] = $sql_arr['email'][0];
}
$this->result->add($sql_arr);
}

2
program/steps/addressbook/func.inc
View File

@@ -348,7 +348,7 @@ function rcmail_contact_form($form, $record, $attrib = null)
$content = '';
// 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))
if ($record['name'] == rcube_addressbook::compose_display_name(array('name' => '') + (array)$record))
unset($record['name']);
// group fields