Changeset 4959 in subversion

Timestamp:

Jul 24, 2011 6:14:13 AM (22 months ago)

Author:

alec

Message:

• DOn't generate contact name here, it's not required

Location:

trunk/roundcubemail/program/steps/addressbook

Files:

• func.inc (modified) (1 diff)
• save.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -415 +415 @@
             $content = '';
 
-            // unset display name if it is composed from name parts (same composition function as in save.inc)
+            // unset display name if it is composed from name parts
             if ($record['name'] == rcube_addressbook::compose_display_name(array('name' => '') + (array)$record))
               unset($record['name']);

trunk/roundcubemail/program/steps/addressbook/save.inc

@@ -137 +137 @@
 }
 
-// let a dedicated function or a plugin compose the full name if empty
-if (empty($a_record['name'])) {
-    $a_record['name'] = rcube_addressbook::compose_display_name($a_record);
-}
-
 
 // do input checks (delegated to $CONTACTS instance)
@@ -222 +217 @@
   $existing = false;
   foreach ($CONTACTS->get_col_values('email', $a_record, true) as $email) {
-      if (($res = $CONTACTS->search('email', $email, false, false)) && $res->count) {
+      if (($res = $CONTACTS->search('email', $email, false, false, true)) && $res->count) {
           $OUTPUT->show_message('contactexists', 'notice', null, false);
           break;