- Another display name fix: don't store display name only if it equals to email address

1 files changed, 9 insertions, 0 deletions

diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 393eb5145..ef1b9f90d 100644
--- a/program/steps/addressbook/save.inc
+++ b/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))
 {