Fix PHP error when merging canonical changes for non-change-tracking#19187
Open
lukeholder wants to merge 1 commit into
Open
Fix PHP error when merging canonical changes for non-change-tracking#19187lukeholder wants to merge 1 commit into
lukeholder wants to merge 1 commit into
Conversation
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
1 participant
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
When a draft owner (e.g. a product) had outdated nested elements that returned false from trackChanges(), NestedElementManager would call Elements::mergeCanonicalChanges() on them, which throws unconditionally for elements that don't track changes.
The fix branches on trackChanges(): elements that support it get the full merge, and those that don't have dateLastMerged stamped so they're no longer considered outdated.
Not sure this is the right fix, or if variants should really support tracking changes somehow going forward.
Related issues
Potential fix for Commerce issue craftcms/commerce#4323