Restrict the branch filter to validated revisions - #442
Open
ECYaz wants to merge 1 commit into
Open
Conversation
The category and index contribution listings matched a contribution against the branch filter whenever any revision row existed for that branch, regardless of the revision's validation state. The only revision_validated check sat inside the permission clause, where it is skipped for moderators and bypassed by the author and view-authorised OR-branches, so a style whose only 3.3 revision had been denied still appeared under the 3.3.x filter with a 3.2 version badge. Build the validated requirement into the branch condition itself, using the same semantics as the version list rendered on the very same page: gated on require_validation, with the validation-free types exempt. The now redundant check in the permission clause is removed.
There was a problem hiding this comment.
Pull request overview
This PR fixes the branch filter logic so contributions only match a selected phpBB branch when they have an eligible (validated) revision for that branch, preventing denied/pulled revisions from causing false matches. It aligns the branch filter’s validation semantics with the existing “version list” logic on the same page (respecting require_validation and exempting validation-free contribution types).
Changes:
- Introduces a centralized
$branch_filterclause that enforces branch matching and (when configured) validated revisions. - Applies
$branch_filterto the main listing queries (category/all/featured flows) instead of in a downstream permission-gating clause. - Removes the redundant
rp.revision_validated = 1check from the permissions WHERE augmentation.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
iMattPro
approved these changes
Jul 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #379
The only
revision_validatedcheck sat inside the permission clause, which moderators skip and authors bypass, so denied revisions still matched the branch filter.The branch condition itself now requires a validated revision, using the same semantics as the version list on the same page (gated on
require_validation, validation-free types exempt), and the redundant check in the permission clause is removed.