From 07010107a4322d5c714287ac8fefab0c70f33133 Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 26 Jul 2011 12:51:19 +0000 Subject: - Another display name fix: don't store display name only if it equals to email address git-svn-id: https://svn.roundcube.net/trunk@4967 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/addressbook/save.inc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/roundcubemail/program/steps/addressbook/save.inc b/roundcubemail/program/steps/addressbook/save.inc index 393eb5145..ef1b9f90d 100644 --- a/roundcubemail/program/steps/addressbook/save.inc +++ b/roundcubemail/program/steps/addressbook/save.inc @@ -164,6 +164,15 @@ if (isset($a_record['photo'])) { $RCMAIL->session->remove('contacts'); } +// Generate contact's display name +if (empty($a_record['name'])) { + $a_record['name'] = rcube_addressbook::compose_display_name($a_record, true); + // Reset it if equals to email address (from compose_display_name()) + if ($a_record['name'] == $a_record['email'][0]) + $a_record['name'] = ''; +} + + // update an existing contact if (!empty($cid)) { -- cgit v1.2.3