Changeset 4768 in subversion

Timestamp:

May 14, 2011 10:38:27 AM (2 years ago)

Author:

thomasb

Message:

Fix sort order when contact name is empty

Location:

trunk/roundcubemail/program/include

Files:

• rcube_contacts.php (modified) (1 diff)
• rcube_mdb2.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_contacts.php

@@ -185 +185 @@
                 ($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,

trunk/roundcubemail/program/include/rcube_mdb2.php

@@ -601 +601 @@
     }
 
+    /**
+     * Abstract SQL statement for value concatenation
+     *
+     * @return string SQL statement to be used in query
+     * @access public
+     */
+    function concat(/* col1, col2, ... */)
+    {
+        $func = '';
+        switch($this->db_provider) {
+            case 'mysql':
+            case 'mysqli':
+                $func = 'CONCAT';
+                $delim = ', ';
+                break;
+            case 'mssql':
+            case 'sqlsrv':
+                $delim = ' + ';
+                break;
+            default:
+                $delim = ' || ';
+        }
+        
+        return $func . '(' . join($delim, func_get_args()) . ')';
+    }
+
 
     /**