From afa0f43d241a971eab34895bd7d876bd674a32ca Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 28 Jun 2021 21:08:15 -0100 Subject: [PATCH] filter personal on canBeVisitor Signed-off-by: Maxence Lange --- lib/Db/CoreQueryBuilder.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php index 3f11ffd50..fc4f2f872 100644 --- a/lib/Db/CoreQueryBuilder.php +++ b/lib/Db/CoreQueryBuilder.php @@ -1218,14 +1218,7 @@ protected function limitInitiatorVisibility(string $alias): ICompositeExpression } if ($this->getBool('canBeVisitor', $options, false)) { // TODO: should find a better way, also filter on remote initiator on non-federated ? - $andXVisitor = $expr->andX(); - $andXVisitor->add($expr->gte($alias . '.config', $this->createNamedParameter(0))); - if ($filterPersonalCircle) { - $andXVisitor->add( - $this->exprFilterBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle) - ); - } - $orX->add($andXVisitor); + $orX->add($this->exprFilterInt('config', Circle::CFG_PERSONAL, $alias)); } if ($this->getBool('canBeVisitorOnOpen', $options, false)) { $andOpen = $expr->andX();