Skip to content

[stable29] fix(CoreQueryBuilder): Use correct member entry for circle as initiator #1764

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

Merged
mejo- merged 3 commits into from
Nov 25, 2024
Merged

[stable29] fix(CoreQueryBuilder): Use correct member entry for circle as initiator #1764

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68f1363
fix(CoreQueryBuilder): Use correct member entry for circle as initiator
mejo- Nov 18, 2024
de86e75
feat(CirclesManager): Add flag to enforce synchronous event execution
mejo- Nov 20, 2024
f4a5c56
test(phpunit): Add basic phpunit integration tests for CirclesManager
mejo- Nov 19, 2024
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
Next Next commit
fix(CoreQueryBuilder): Use correct member entry for circle as initiator 
Before, the member entry that matched the `singleId` of the user and
`level = 9` was used as initiator, which in practice means the member
entry for the internal user circle of the user most of the time.

Instead, we want to use the member entry that matches `singleId` of
the user and `circleId` of the circle in question.

This fixes the wrong `level` being set for `initiator` when calling
`circleProbe()` with `DataProbe::INITIATOR`.

Fixes: #1757

Signed-off-by: Jonas <[email protected]>
  • Loading branch information
@mejo-
mejo- committed Nov 25, 2024
commit 68f136372b658ccb33b5e10ded5cb09d890e695c
4 changes: 2 additions & 2 deletions lib/Db/CoreQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,8 +1327,8 @@ public function completeProbeWithInitiator(
->leftJoin(
$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
$expr->andX(
$expr->eq($aliasInitiator . '.circle_id', $helperAlias . '.' . $field),
$this->exprLimitInt('level', Member::LEVEL_OWNER, $aliasInitiator)
$expr->eq($aliasInitiator . '.circle_id', $alias . '.unique_id'),
$expr->eq($aliasInitiator . '.' . $field, $helperAlias . '.inheritance_first'),
)
);
//
Expand Down