Changeset 4973 in subversion

Timestamp:

Jul 27, 2011 6:52:38 AM (22 months ago)

Author:

alec

Message:

• Generate display name before record validation

File:

• trunk/roundcubemail/program/steps/addressbook/save.inc (modified) (2 diffs)

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

@@ -137 +137 @@
 }
 
+// Generate contact's display name (must be before validation)
+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'] = '';
+}
 
 // do input checks (delegated to $CONTACTS instance)
@@ -165 +172 @@
 }
 
-// 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