[6.x] Fix cache invalidation when using custom fields in URI route#14564
Merged
jasonvarga merged 2 commits into6.xfrom Apr 28, 2026
Merged
[6.x] Fix cache invalidation when using custom fields in URI route#14564jasonvarga merged 2 commits into6.xfrom
jasonvarga merged 2 commits into6.xfrom
Conversation
Member
|
Heads up on one bundled-but-unrelated change: switching
No current caller hits this — |
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.
This pull request fixes an issue where structured entries using custom fields in their route (e.g.
{test}) would have stale URIs after saving.This was happening because
CollectionStructure::entryUri()retrieves aPagefrom cachedflattenedPages, and thatPagecaches itsrouteDataon the instance. When the entry is saved with updated field values, the samePageobject is reused with stale route data, causing the URI to reflect the old field value instead of the new one.This PR fixes it by:
$page->setEntry($entry)inCollectionStructure::entryUri()to ensure the page uses the fresh entry being savedrouteDataandstructure-urisblink inPage::setEntry()so stale values are discardedmakeItemFromFile()call inCollectionEntriesStore::writeItemToDisk()with a direct YAML ID parse, avoiding a side effect that put stale entries into thestructure-entriesblink storeempty($ids)checks inupdateEntriesWithinIndex()andupdateEntriesWithinStore()to usecollect($ids)->isEmpty(), sinceempty()always returnsfalsefor Collection objectsFixes #14145