Imported Upstream version 0.7.2

[roundcube.git] / program / steps / mail / addcontact.inc

diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index 5b77b56e81ec68cea6c693cb20aaa751c91fb8e6..766dcc8cfedcf0b8cf252f75a65e85fa2e5bf6e7 100644 (file)
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -15,7 +15,7 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: addcontact.inc 5415 2011-11-11 15:04:45Z alec $
+ $Id: addcontact.inc 5873 2012-02-11 13:50:04Z thomasb $
 
 */
 
@@ -58,7 +58,10 @@ if (!empty($_POST['_address']) && is_object($CONTACTS))
     }
 
     $contact['email'] = rcube_idn_to_utf8($contact['email']);
-    $contact['name'] = rcube_addressbook::compose_display_name($contact);
+    $contact = $RCMAIL->plugins->exec_hook('contact_displayname', $contact);
+
+    if (empty($contact['firstname']) || empty($contact['surname']))
+      $contact['name'] = rcube_addressbook::compose_display_name($contact);
 
     // validate contact record
     if (!$CONTACTS->validate($contact, true)) {