Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Escape html before replace new line with break #11058

Merged
merged 3 commits into from
Sep 27, 2017
Merged

Escape html before replace new line with break #11058

merged 3 commits into from
Sep 27, 2017

Conversation

Quinten
Copy link

@Quinten Quinten commented Sep 26, 2017 •
edited by vrann
Loading

Fixes #10330

Multiline addresses are stored in the database with new lines
The new lines were replaced and then escaped (in the wrong order)
so the breaks were rendered as htmlentities
became <br />

Description

Fixed Issues (if relevant)

  1. magento/magento2#<issue_number>: Issue title
  2. ...

Manual testing scenarios

  1. ...
  2. ...

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

heyitsroberthe and others added 3 commits September 12, 2017 20:36
@heyitsroberthe @paliarush
MAGETWO-70580: Merged fixes
c3ea1f5
@viktym
Merge pull request magento#1483 from magento-mpi/MAGETWO-72551
0c0393d 
[mpi] MAGETWO-72551: Update version in composer to 2.2.1-dev for 2.2-develop branch
Escape html before replace new line with break
d93173d 
Fixes magento#10330

Multiline addresses are stored in the database with new lines
The new lines were replaced and then escaped (in the wrong order)
so the breaks were rendered as htmlentities <br /> became &lt;br /&gt;
@magento-cicd2
Copy link
Contributor

magento-cicd2 commented Sep 26, 2017 •
edited
Loading

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 3 committers have signed the CLA.

✅ Quinten
❌ paliarush
❌ viktym

@okorshenko okorshenko added this to the September 2017 milestone Sep 26, 2017
@okorshenko okorshenko assigned okorshenko and unassigned okorshenko Sep 26, 2017
@vrann vrann self-assigned this Sep 27, 2017
@magento-team magento-team merged commit d93173d into magento:2.2-develop Sep 27, 2017
magento-team pushed a commit that referenced this pull request Sep 27, 2017
@vrann
MAGETWO-80081: Escape html before replace new line with break #11058
f7b0fe3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@vrann vrann

Labels
Progress: accept Release Line: 2.2
Projects
None yet
Milestone
September 2017
Development

Successfully merging this pull request may close these issues.
8 participants
@Quinten @magento-cicd2 @hostep @magento-team @vrann @okorshenko @heyitsroberthe @viktym