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 Smarty & domain token processing to use token processor #19598

Merged
merged 1 commit into from
Feb 18, 2021

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Feb 15, 2021

Overview

Convert Smarty & domain token processing to use token processor

This is a subset of the changes in
#19550 that we should be able to resolve
& merge while addressing that takes longer. It still gets us the
benefit of adopting a preferred pattern

Before

Code uses older less preferred pattern

After

Code uses newer preferred pattern. In addition there is

  1. less leakage around smarty variables
  2. more consistency about handling of line breaks in subject lines (consistently converted to spaces with whitespace stripped from the end)

Technical Details

Note that some test changes exist around handling of subject -
the code now converts a new line to a space consistently. In addition
tests that rely on leakage have been altered as smarty does not leak with
this approach

Comments

This is a subset of the changes in
civicrm#19550 that we should be able to resolve
& merge while addressing that takes longer. It still gets us the
benefit of adopting a preferred pattern

Note that some test changes exist around handling of subject -
the code now converts a new line to a space consistently. In addition
tests that rely on leakage have been altered as smarty does not leak with
this approach
@civibot
Copy link

civibot bot commented Feb 15, 2021

(Standard links)

@civibot civibot bot added the master label Feb 15, 2021
@mattwire mattwire merged commit b5145c1 into civicrm:master Feb 18, 2021
@eileenmcnaughton eileenmcnaughton deleted the msg_tpl_less branch February 18, 2021 19:32
@eileenmcnaughton
Copy link
Contributor Author

Thanks @mattwire I've rebased the other (of course the issues are still there with the other but they are clearer now)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants