diff --git a/CHANGELOG b/CHANGELOG index 301f0c100e3..16931ef8946 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 -------------- diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php index c26527cba1e..6082d8d2569 100644 --- a/program/lib/Roundcube/rcube_contacts.php +++ b/program/lib/Roundcube/rcube_contacts.php @@ -487,7 +487,7 @@ private function _count() // 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 @@ private function _count() $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']; }