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

Afform - Fix incorrect html encoding when saving #29400

Merged
merged 1 commit into from
Feb 18, 2024
Merged

Afform - Fix incorrect html encoding when saving #29400

merged 1 commit into from
Feb 18, 2024

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Feb 15, 2024 •
edited
Loading

Overview

Fixes regression described in https://lab.civicrm.org/dev/core/-/issues/4977

Technical Details

This reverts 0ae1b99 AND 4a439e7.

So this takes us all the way back to the original version of the function, which actually worked fine for what it did. I guess anything fancier than a str_replace() was just asking for trouble...

@civibot civibot
Copy link

civibot bot commented Feb 15, 2024

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷

Introduction for new contributors...
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers...

➡️ Online demo of this PR 🔗

@civibot civibot bot added the 5.71 label Feb 15, 2024
This was referenced Feb 15, 2024
Merged
Merged
@colemanw
Afform - Fix incorrect html encoding when saving
9afe93f 
Fixes  https://lab.civicrm.org/dev/core/-/issues/4977

This reverts 0ae1b99 AND 4a439e7 back to the original version which used a simple str_replace.

The problem with 4a439e7 is that function mode is deprecated in php 8.2.
The problem with 0ae1b99 is that it was wrong and broke the html encoding of the file.

So this takes us all the way back to the original version of the function, which worked fine for what it did.
@mlutfy mlutfy merged commit c2cf1f4 into civicrm:5.71 Feb 18, 2024
3 checks passed
@mlutfy
Copy link
Member

mlutfy commented Feb 18, 2024

I tested on 5.71 and can confirm that it fixes the issue. Thank you @colemanw !

@colemanw colemanw deleted the unicodeHtml branch February 18, 2024 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
5.71 has-test sig:regression
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@colemanw @mlutfy