diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2020-08-10 15:32:20 +0300 |
|---|---|---|
| committer | Maxence Lange <maxence@artificial-owl.com> | 2020-08-10 15:32:20 +0300 |
| commit | 36eee032daf4ce06c8bdb5fbbca5771771a2baa6 (patch) | |
| tree | c19150a861e0f3eddaabaf362d9c1fc1d30e40fa | |
| parent | 8554bc7e1612f12d5f3bf16cc7df94267d9af11a (diff) | |
do not empty search on altnamefix/noid/no-search-on-altname-if-empty
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| -rw-r--r-- | lib/Db/CirclesRequestBuilder.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Db/CirclesRequestBuilder.php b/lib/Db/CirclesRequestBuilder.php index fc02595c..4b18b5da 100644 --- a/lib/Db/CirclesRequestBuilder.php +++ b/lib/Db/CirclesRequestBuilder.php @@ -173,9 +173,12 @@ class CirclesRequestBuilder extends CoreRequestBuilder { $orX = $expr->orX($expr->gte('u.level', $qb->createNamedParameter(Member::LEVEL_MEMBER))); $orX->add($expr->eq('c.name', $qb->createNamedParameter($name))) - ->add($expr->eq('c.alt_name', $qb->createNamedParameter($name))) ->add($expr->eq('c.unique_id', $qb->createNamedParameter($circleUniqueId))); + if ($name !== '') { + $orX->add($expr->eq('c.alt_name', $qb->createNamedParameter($name))); + } + if ($this->leftJoinedNCGroupAndUser) { $orX->add($expr->gte('g.level', $qb->createNamedParameter(Member::LEVEL_MEMBER))); } |