Changeset 4764 in subversion

Timestamp:

May 13, 2011 1:51:28 PM (2 years ago)

Author:

thomasb

Message:

Fix empty name in search results and error when creating a new contact

Location:

trunk/roundcubemail/program

Files:

• include/rcube_contacts.php (modified) (1 diff)
• steps/addressbook/func.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_contacts.php

@@ -201 +201 @@
             else
                 $sql_arr['email'] = preg_split('/,\s*/', $sql_arr['email']);
-            
+
             // make sure we have a name to display
-            if (empty($sql_arr['name']))
+            if (empty($sql_arr['name'])) {
+                if (empty($sql_arr['email']))
+                  $sql_arr['email'] = $this->get_col_values('email', $sql_arr, true);
                 $sql_arr['name'] = $sql_arr['email'][0];
+            }
 
             $this->result->add($sql_arr);

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

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