Browse Source
Merge pull request #8980 from nextcloud/bugfix/noid/always-sort-breakout-rooms
fix(API): Sort listed conversations on API level so CI results are stable
pull/8996/head
Joas Schilling
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
1 deletions
-
lib/Manager.php
|
|
|
@ -493,7 +493,8 @@ class Manager { |
|
|
|
)) |
|
|
|
->where($query->expr()->isNull('a.id')) |
|
|
|
->andWhere($query->expr()->in('r.type', $query->createNamedParameter($allowedRoomTypes, IQueryBuilder::PARAM_INT_ARRAY))) |
|
|
|
->andWhere($query->expr()->in('r.listable', $query->createNamedParameter($allowedListedTypes, IQueryBuilder::PARAM_INT_ARRAY))); |
|
|
|
->andWhere($query->expr()->in('r.listable', $query->createNamedParameter($allowedListedTypes, IQueryBuilder::PARAM_INT_ARRAY))) |
|
|
|
->orderBy('r.id', 'ASC'); |
|
|
|
|
|
|
|
if ($term !== '') { |
|
|
|
$query->andWhere( |
|
|
|
|
