dev/core#2814 Fix activity:sendEmail to use renderTemplate #21365
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
| ], | ||
| '{contact.first_name} {$contact.first_name}', | ||
| '{contact.first_name} {$contact.first_name}', | ||
| '{contact.first_name} {$contact.first_name}', |
There was a problem hiding this comment.
phpcs doesn't catch these indents I guess. Also down on line 1732.
There was a problem hiding this comment.
That's not like phpcs - to be forgiving - fixed
Note that this does create a situation where more queries could occur but 1) this is only called in core from the email task - which is limited to 50 contacts so it is low-volume 2) this is really the start of a cleanup - there are other places where queries can be removed when we look at the total flow but I feel we need to get some simplification happening first & hence have picked on this focus as the first step (ie removing the calls to replaceContactTokens) 3) this seems to be called in extensions to some extent - and it should still work - there might be more queries but I think the 'support contract' for calling an unsupported function does not include it working in ways not required by core code
eileenmcnaughton
force-pushed
the
act_send
branch
from
3986422 to
0952020
Compare
|
I agree test cover is good, and this PR adds more tests. Refactoring makes sense. |
|
Emails now have the literal |
|
@demeritcowboy yeah - looks like the tests focussed on the created activity & I didn't spot it wasn't passing through. Fix coming |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
dev/core#2814 Fix activity:sendEmail to use renderTemplate
Before
ReplaceContactTokenscalledAfter
renderTemplatecalledTechnical Details
There is good test cover on this. I added an extra test for the scenario where smarty is enabled in this context. All other changes in the relevant tests are tidy ups & don't materially change them.
Note that this does create a situation where more queries could occur but
this is only called in core from the email task - which is limited to 50 contacts so it
is low-volume
this is really the start of a cleanup - there are other places where
queries can be removed when we look at the total flow but I feel we need to get
some simplification happening first & once we are doing things in a more consistent way I will be better placed to rationalise the queries
this seems to be called in extensions to some extent - and it should still work
unsupported function does not include it working in ways not required by
core code
Comments