alecpl
2011-05-21 bc8c2c57880523472b30f475d566a8133e2d2e20
program/include/rcube_contacts.php
@@ -184,7 +184,7 @@
                " AND c.user_id=?" .
                ($this->group_id ? " AND m.contactgroup_id=?" : "").
                ($this->filter ? " AND (".$this->filter.")" : "") .
            " ORDER BY c.name, c.email",
            " ORDER BY ". $this->db->concat('c.name', 'c.email'),
            $start_row,
            $length,
            $this->user_id,
@@ -200,10 +200,13 @@
                $sql_arr = $this->convert_db_data($sql_arr);
            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);
        }