summaryrefslogtreecommitdiff
path: root/roundcubemail/program
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-26 12:51:19 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-07-26 12:51:19 +0000
commit07010107a4322d5c714287ac8fefab0c70f33133 (patch)
tree618593aec90bf412986ab9f922e11b8729efcfc6 /roundcubemail/program
parentb5fbd432d67a2184f75899f08197dceacc1aef26 (diff)
- 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
Diffstat (limited to 'roundcubemail/program')
-rw-r--r--roundcubemail/program/steps/addressbook/save.inc9
1 files changed, 9 insertions, 0 deletions
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))
{