Skip to content

[stable32] fix(Matterbridge): fix a regression in the additional validation of the bridge parts #20060

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
sudormant merged 1 commit into from
Oct 30, 2026
Merged

[stable32] fix(Matterbridge): fix a regression in the additional validation of the bridge parts #20060

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions lib/MatterbridgeManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ private function checkBridgeProcess(Room $room, array $bridge, bool $relaunch =

// check if current $bridge parts (domain) are still valid before doing anything
try {
$this->validateParts($bridge); // no return needed, validateParts will throw exception
$this->validateParts($bridge['parts']); // no return needed, validateParts will throw exception
} catch (\InvalidArgumentException $e) {
$this->logger->error($e->getMessage());

Expand All @@ -617,8 +617,7 @@ private function checkBridgeProcess(Room $room, array $bridge, bool $relaunch =
->where($query->expr()->eq(
'pid',
$query->createNamedParameter($bridge['pid'], IQueryBuilder::PARAM_INT)));
$result = $query->executeQuery();
$result->closeCursor();
$query->executeStatement();

}
return $pid; // pid remains unchanged 0, i.e. no process with invalid parts running
Expand Down
Loading