diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-04-28 09:38:07 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-04-28 09:38:07 +0200 |
| commit | 54185837c83bf93ff2d971b986ac13530c1e840b (patch) | |
| tree | 16e992320a0eed5a508a8c9d16420358105aca50 /program/lib | |
| parent | b34d67907566663ab46b487b99817673ce4e32e5 (diff) | |
Make identity name field optional (#1489510)
Get rid of unhelpful error message.
Diffstat (limited to 'program/lib')
| -rw-r--r-- | program/lib/Roundcube/rcube_user.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php index e232736c9..739b6f2a0 100644 --- a/program/lib/Roundcube/rcube_user.php +++ b/program/lib/Roundcube/rcube_user.php @@ -267,7 +267,10 @@ class rcube_user "SELECT * FROM ".$this->db->table_name('identities'). " WHERE del <> 1 AND user_id = ?". ($sql_add ? " ".$sql_add : ""). - " ORDER BY ".$this->db->quote_identifier('standard')." DESC, name ASC, identity_id ASC", + " ORDER BY ". $this->db->quote_identifier('standard') . " DESC, " + . $this->db->quote_identifier('name') . " ASC, " + . $this->db->quote_identifier('email') . " ASC, " + . $this->db->quote_identifier('identity_id') . " ASC", $this->ID); while ($sql_arr = $this->db->fetch_assoc($sql_result)) { |