Skip to content
This repository was archived by the owner on Feb 23, 2024. It is now read-only.

Conversation

@haszari
Copy link
Contributor

@haszari haszari commented Jan 20, 2020

This fixes #1586 for 2.5.11+, ensuring correct display of ampersands in product attribute values.

This PR manually applies relevant changes from PR #1597 to the release/2.5 branch.

The original PR cannot be automatically cherry picked as it touches code that has changed significantly on master. Instead, the relevant changes have been manually committed in this PR :)

- changes can't be cherry picked automatically due to significant
other API changes on master
@haszari haszari requested a review from a team January 20, 2020 01:26
@haszari haszari self-assigned this Jan 20, 2020
@haszari haszari requested review from mikejolley and nerrad January 20, 2020 01:27
@haszari
Copy link
Contributor Author

haszari commented Jan 20, 2020

I'm going to merge this into release/2.5 and continue building/testing the release (including these changes). I made this PR for transparency, feel free to double-check my manual cherry picking :)

@haszari haszari merged commit 5539dcc into release/2.5 Jan 20, 2020
@haszari haszari deleted the fix/1594-consistent-api-html-entities-2.5-manual-cherry-pick branch January 20, 2020 01:42
haszari added a commit that referenced this pull request Jan 20, 2020
@nerrad
Copy link
Contributor

nerrad commented Jan 20, 2020

Just commenting that this looks good.

@haszari haszari added this to the 2.5.11 milestone Jan 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants