[6.x] Fix element query clones not being able to apply new criteria#18826
Merged
brandonkelly merged 2 commits intoMay 11, 2026
Merged
Conversation
brandonkelly
deleted the
rias/cms-2064-6x-element-index-page-for-structure-maxlevels-1-section
branch
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
2 participants
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.
Description
Fixes #18825
Fixed a query cloning bug where ElementQuery clones created after execution could retain their prepared internal state. That meant criteria added to the clone, such as
descendantOf(), could be ignored.This caused Structure element indexes to count all rows as descendants when rendering child toggles, so max-level-1 Structure entries could incorrectly show carets. Cloned executed queries now restore their unprepared query state before being further narrowed.