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.

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

Convert new lines to page breaks when rendering text tokens to html #27203

Merged
merged 1 commit into from Sep 5, 2023

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Aug 30, 2023

Overview

Convert new lines to page breaks when rendering text tokens to html

Before

When rendering a token for an plain text as html the new lines are lost. e.g if the text content is

Important text
Other text

then there is no line break in the html

After

The text is passed through the nl2br function

Technical Details

This really feels like expected behaviour - when entering data in a field where the field supports new lines the new lines should be implemented in any (e.g.) pdfs that leverage the fields as tokens.

Comments

The reverse is in #27204

@civibot
Copy link

civibot bot commented Aug 30, 2023

🤖 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 🔗

@larssandergreen
Copy link
Contributor

This makes sense, maybe I'll just do an r-run of all three of these together.

@eileenmcnaughton
Copy link
Contributor Author

thanks @larssandergreen - I split them out cos I think the covert to text one might take longer to approve/ (?reject?) than the others

@larssandergreen larssandergreen added the merge ready PR will be merged after a few days if there are no objections label Sep 5, 2023
@larssandergreen
Copy link
Contributor

This one is also good to go, reviewed, tested.

@colemanw colemanw merged commit 139343e into civicrm:master Sep 5, 2023
3 checks passed
@colemanw colemanw deleted the nl2br branch September 5, 2023 17:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
master merge ready PR will be merged after a few days if there are no objections
Projects
None yet
3 participants