From 9063eca3ff64304075a5e7c4e164ee62b41d48ce Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 2 Jan 2023 18:30:43 +1300 Subject: [PATCH] Remove code deprecated in 2019 --- CRM/Contact/BAO/Query.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index 054de8adbf..86c6ae86fc 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -6747,8 +6747,6 @@ AND displayRelType.is_active = 1 * @param string $additionalFromClause * Should be clause with proper joins, effective to reduce where clause load. * - * @param bool $skipOrderAndLimit - * * @return string * * @throws \CRM_Core_Exception @@ -6758,23 +6756,10 @@ AND displayRelType.is_active = 1 $count = FALSE, $includeContactIds = FALSE, $sortByChar = FALSE, $groupContacts = FALSE, $additionalWhereClause = NULL, $sortOrder = NULL, - $additionalFromClause = NULL, $skipOrderAndLimit = FALSE) { + $additionalFromClause = NULL) { $sqlParts = $this->getSearchSQLParts($offset, $rowCount, $sort, $count, $includeContactIds, $sortByChar, $groupContacts, $additionalWhereClause, $sortOrder, $additionalFromClause); - - if ($sortByChar) { - CRM_Core_Error::deprecatedFunctionWarning('sort by char is deprecated - use alphabetQuery method'); - $sqlParts['order_by'] = 'ORDER BY sort_name asc'; - } - - if ($skipOrderAndLimit) { - CRM_Core_Error::deprecatedFunctionWarning('skipOrderAndLimit is deprected - call getSearchSQLParts & construct it in the calling function'); - $query = "{$sqlParts['select']} {$sqlParts['from']} {$sqlParts['where']} {$sqlParts['having']} {$sqlParts['group_by']}"; - } - else { - $query = "{$sqlParts['select']} {$sqlParts['from']} {$sqlParts['where']} {$sqlParts['having']} {$sqlParts['group_by']} {$sqlParts['order_by']} {$sqlParts['limit']}"; - } - return $query; + return "{$sqlParts['select']} {$sqlParts['from']} {$sqlParts['where']} {$sqlParts['having']} {$sqlParts['group_by']} {$sqlParts['order_by']} {$sqlParts['limit']}"; } /** -- 2.25.1