Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove now-obsolete additionalFromClause parameter from prepareOrderBy #13874

Merged
merged 1 commit into from
Mar 21, 2019
Merged

Remove now-obsolete additionalFromClause parameter from prepareOrderBy #13874

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions CRM/Contact/BAO/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6275,12 +6275,11 @@ public static function processSpecialFormValue(&$formValues, $specialFields, $ch
* The order by string.
* @param null $sortOrder
* Who knows? Hu knows. He who knows Hu knows who.
* @param string $additionalFromClause
* Should be clause with proper joins, effective to reduce where clause load.
*
* @return array
* list(string $orderByClause, string $additionalFromClause).
*/
protected function prepareOrderBy($sort, $sortOrder, $additionalFromClause) {
protected function prepareOrderBy($sort, $sortOrder) {
$orderByArray = [];
$orderBy = '';

Expand Down Expand Up @@ -6321,7 +6320,7 @@ protected function prepareOrderBy($sort, $sortOrder, $additionalFromClause) {
}
}
if (!$orderBy) {
return [NULL, $additionalFromClause];
return NULL;
}
// Remove this here & add it at the end for simplicity.
$order = trim($orderBy);
Expand Down Expand Up @@ -6397,7 +6396,7 @@ protected function prepareOrderBy($sort, $sortOrder, $additionalFromClause) {
// clause. But this magic helper which forgivingly reescapes ORDER BY.
if ($order) {
$order = CRM_Utils_Type::escape($order, 'MysqlOrderBy');
return array(' ORDER BY ' . $order, $additionalFromClause);
return ' ORDER BY ' . $order;
}
}

Expand Down Expand Up @@ -6749,7 +6748,7 @@ public function getSearchSQLParts($offset = 0, $rowCount = 0, $sort = NULL,
$order = $orderBy = '';
if (!$count) {
if (!$sortByChar) {
list($order, $additionalFromClause) = $this->prepareOrderBy($sort, $sortOrder, $additionalFromClause);
$order = $this->prepareOrderBy($sort, $sortOrder);
}
}
// Cases where we are disabling FGB (FULL_GROUP_BY_MODE):
Expand Down