|
|
|
@ -532,8 +532,12 @@ abstract class rcube_addressbook
|
|
|
|
|
$fn = join(' ', array($contact['surname'], $contact['firstname'], $contact['middlename']));
|
|
|
|
|
else if ($compose_mode == 1)
|
|
|
|
|
$fn = join(' ', array($contact['firstname'], $contact['middlename'], $contact['surname']));
|
|
|
|
|
else
|
|
|
|
|
else if ($compose_mode == 0)
|
|
|
|
|
$fn = !empty($contact['name']) ? $contact['name'] : join(' ', array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']));
|
|
|
|
|
else {
|
|
|
|
|
$plugin = rcube::get_instance()->plugins->exec_hook('contact_listname', array('contact' => $contact));
|
|
|
|
|
$fn = $plugin['fn'];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$fn = trim($fn, ', ');
|
|
|
|
|
|
|
|
|
|