Changeset e848180 in github for program/include/rcube_contacts.php

Timestamp:

May 12, 2011 4:18:19 PM (2 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

b912158

Parents:

caedd52

Message:

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

File:

• program/include/rcube_contacts.php (modified) (2 diffs)

program/include/rcube_contacts.php

@@ -185 +185 @@
                 ($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,
@@ -411 +411 @@
     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');