thomascube
2011-05-13 445a4ca04dfcd255f9d89ee76757b04c2d87bbfc
Fix empty name in search results and error when creating a new contact

2 files modified
7 ■■■■ changed files
program/include/rcube_contacts.php 5 ●●●● patch | view | raw | blame | history
program/steps/addressbook/func.inc 2 ●●● patch | view | raw | blame | history
program/include/rcube_contacts.php
@@ -202,8 +202,11 @@
                $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);
        }
program/steps/addressbook/func.inc
@@ -348,7 +348,7 @@
            $content = '';
            // 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']);
            // group fields