From bf0d1c47a0e4025edc096424199a48098a231d6d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 27 Apr 2016 10:42:31 +0000 Subject: [PATCH] fix sql error after clear cache, because db class has again type "mysqli" instead of just "mysql" --- api/src/Storage/Base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/Storage/Base.php b/api/src/Storage/Base.php index a0831d781d..70aa354a4d 100644 --- a/api/src/Storage/Base.php +++ b/api/src/Storage/Base.php @@ -1127,7 +1127,7 @@ class Base public static function fix_group_by_columns($group_by, &$columns, $table_name, $autoinc_id) { $matches = null; - if ($GLOBALS['egw']->db->Type == 'mysql' || !preg_match('/(GROUP BY .*)(HAVING.*|ORDER BY.*)?$/iU', $group_by, $matches)) + if (substr($GLOBALS['egw']->db->Type, 0, 5) == 'mysql' || !preg_match('/(GROUP BY .*)(HAVING.*|ORDER BY.*)?$/iU', $group_by, $matches)) { return $group_by; // nothing to do }