Fix SQL syntax error on MariaDB 10.2 (#5774)

pull/5589/merge
Aleksander Machniak 8 years ago
parent bb67757b5c
commit 6ad4ebe431

@ -19,6 +19,7 @@ CHANGELOG Roundcube Webmail
- Fix POST parameter reflection in default_charset selector (#5768)
- Enigma: Fix compatibility with assets_dir
- Managesieve: Skip redundant LISTSCRIPTS command
- Fix SQL syntax error on MariaDB 10.2 (#5774)
RELEASE 1.3-rc
--------------

@ -487,7 +487,7 @@ class rcube_contacts extends rcube_addressbook
// count contacts for this user
$sql_result = $this->db->query(
"SELECT COUNT(c.`contact_id`) AS rows".
"SELECT COUNT(c.`contact_id`) AS cnt".
" FROM " . $this->db->table_name($this->db_name, true) . " AS c".
$join.
" WHERE c.`del` <> 1".
@ -500,7 +500,7 @@ class rcube_contacts extends rcube_addressbook
$sql_arr = $this->db->fetch_assoc($sql_result);
$this->cache['count'] = (int) $sql_arr['rows'];
$this->cache['count'] = (int) $sql_arr['cnt'];
return $this->cache['count'];
}

Loading…
Cancel
Save