Merge pull request #1 from markscarbrough/LTS-mariadb-patch

Fix SQL syntax error on MariaDB 10.2 (roundcube#5774), backported from 1.3 release to the 1.1 LTS release.
markscarbrough · Jul 3, 2019 · cda14db · cda14db
2 parents fe0dc4e + 910030b
commit cda14db
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php
@@ -481,7 +481,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".
@@ -494,7 +494,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'];
     }