Repository navigation
[6.x] Forget the structure's memoized collection on collection save and delete - #15549
Merged
jasonvarga merged 1 commit intoSep 30, 2026
Conversation
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_016o2kMZ4DZaNGJ4pUqPov7D
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 #15548.
CollectionStructure::collection()caches the collection in Blink undercollection-structure-collection-{handle}.Collection::save()clearscollection-{handle}*by prefix, which doesn't match that key, andCollection::delete()doesn't clear it at all. So after a collection is replaced by a new instance with different sites, its structure keeps answering from the old instance, andstructure()->in($site)returnsnullfor a site the collection is now in.This adds a
Blink::forget()for that key to bothsave()anddelete().Tests:
saving_clears_the_collection_memoized_by_its_structuresaves a structured collection onen, resolves its structure, saves a new instance onfr, and asserts the structure resolves a tree forfr. It fails without the fix.deleting_clears_the_collection_memoized_by_its_structureasserts the key is gone afterdelete(). It fails without the fix.it_saves_the_collection_through_the_apimocks Blink strictly, so it now expects the extraforget().Other ways to fix this, in case one of them is preferred:
collection-{handle}-structure-collection, so the existingflushStartingWith()insave()covers it. That's cleaner, butdelete()would still need an explicit clear.Collection::findByHandle()each time. This runs once per entry, so it trades the cache for repeated repository lookups.This is separate from #5046, which is about
Tree's cached data and isn't changed here.