1
0
mirror of https://github.com/flarum/core.git synced 2025-08-06 08:27:42 +02:00

fix: sort field in search queries conflicts between multiple tables

Signed-off-by: Sami Mazouz <ilyasmazouz@gmail.com>
This commit is contained in:
Sami Mazouz
2022-07-07 13:14:47 +01:00
parent 5753edac79
commit 03178bb460

View File

@@ -33,12 +33,14 @@ trait ApplyQueryParametersTrait
$sort($query->getQuery());
} else {
foreach ((array) $sort as $field => $order) {
$field = $query->getQuery()->from.'.'.Str::snake($field);
if (is_array($order)) {
foreach ($order as $value) {
$query->getQuery()->orderByRaw(Str::snake($field).' != ?', [$value]);
$query->getQuery()->orderByRaw($field.' != ?', [$value]);
}
} else {
$query->getQuery()->orderBy(Str::snake($field), $order);
$query->getQuery()->orderBy($field, $order);
}
}
}