From e848180aaa9640de871796ca1a3e4f8110701fd6 Mon Sep 17 00:00:00 2001 From: thomascube Date: Thu, 12 May 2011 20:18:19 +0000 Subject: Improve display name composition when saving contacts (#1487143), with plugin-support; allow empty names in sql address book, fall back to e-mail address in listing and vcard export --- program/include/rcube_contacts.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program/include/rcube_contacts.php') diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 3c713fe19..8abc76302 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -184,7 +184,7 @@ class rcube_contacts extends rcube_addressbook " AND c.user_id=?" . ($this->group_id ? " AND m.contactgroup_id=?" : ""). ($this->filter ? " AND (".$this->filter.")" : "") . - " ORDER BY c.name", + " ORDER BY c.name, c.email", $start_row, $length, $this->user_id, @@ -410,10 +410,10 @@ class rcube_contacts extends rcube_addressbook */ public function validate($save_data) { - // check for name input + // validate e-mail addresses $valid = parent::validate($save_data); - // require at least one e-mail address (syntax check is done later in save.inc) + // require at least one e-mail address (syntax check is already done) if ($valid && !array_filter($this->get_col_values('email', $save_data, true))) { $this->set_error('warning', 'noemailwarning'); $valid = false; -- cgit v1.2.3