[5.x] Revert detect recursion when augmenting Entries (#11854) #11894
+0
−49
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
This reverts commit 6f2a5fb.
JohnathonKoster
changed the title
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 PR fixes #11892 by reverting the changes in #11854 and removes the need for #11888. I'll keep the original idea in the back of my head for a potential implementation in the future.
From investigation, the over-aggressive behavior is related to multi-site; specifically this line https://github.com/statamic/cms/blob/5.x/src/Data/HasOrigin.php#L58 will trigger the recursive detection. I have not been able to reproduce the aggressive behavior in simple sites, but have seen it in action on more complicated sites. Removing the exception throwing on that site also didn't end up in infinite recursion, which is very odd.
Current suggestion is to simply revert until I can track down where along the way things are getting messy, which may take some time. Also currently refraining from adding something to the log, as that has the potential to generate a ton of false positive log entries on large sites (would like to eventually track down the root cause, instead).