From 960ba3862dcc1314c060ea2c173699b49ea54d04 Mon Sep 17 00:00:00 2001 From: Bradley Taylor Date: Wed, 19 Jan 2022 20:05:32 +0000 Subject: [PATCH] (NFC) Minor amends to getGroupByFromSelectColumns --- CRM/Contact/BAO/Query.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index ed68196eb3..e9fda0f665 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -4873,16 +4873,15 @@ civicrm_relationship.start_date > {$today} } /** - * Include Select columns in groupBy clause. + * Include select columns in groupBy clause. * * @param array $selectClauses - * @param array $groupBy - Columns already included in GROUP By clause. + * @param array|string|null $groupBy - Columns already included in GROUP By clause. * * @return string */ public static function getGroupByFromSelectColumns($selectClauses, $groupBy = NULL) { $groupBy = (array) $groupBy; - $mysqlVersion = CRM_Core_DAO::singleValueQuery('SELECT VERSION()'); $sqlMode = CRM_Core_DAO::singleValueQuery('SELECT @@sql_mode'); //return if ONLY_FULL_GROUP_BY is not enabled. -- 2.25.1