dev/core#2814 Remove redundant call to replaceContactTokens
#21414
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)
|
eileenmcnaughton
changed the title
replaceContactTokens
eileenmcnaughton
commented
Sep 9, 2021
| @@ -149,7 +149,6 @@ public function onRender(TokenRenderEvent $e) { | |||
|
|
|||
| if (!empty($e->context['contact'])) { | |||
| \CRM_Utils_Token::replaceGreetingTokens($e->string, $e->context['contact'], $e->context['contact']['contact_id'], NULL, $useSmarty); | |||
| $e->string = \CRM_Utils_Token::replaceContactTokens($e->string, $e->context['contact'], $isHtml, $e->message['tokens'], TRUE, $useSmarty); | |||
There was a problem hiding this comment.
The only difference between how this is called here & how it is called in replaceGreetingTokens is that in the former case it always sets TRUE for $isHtml - however it wouldn't matter because the tokens are replaced in the first function so true vs false is meaningless here.
eileenmcnaughton
changed the title
replaceContactTokensreplaceContactTokens
eileenmcnaughton
force-pushed
the
greet
branch
from
5c44a00 to
e1511a5
Compare
eileenmcnaughton
force-pushed
the
greet
branch
from
e1511a5 to
2d1f2ae
Compare
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
Remove redundant call
Before
replaceContactTokenscalled inreplaceGreetingTokensand after it tooAfter
poof
Technical Details
See #21413 for what it looks like if we copy
replaceGreetingTokensback into theTokenCompatSubscriberready to clean it up - it becomes clear this call is already happening and this is a duplicate(the same appears to be true of the hook call).
Logically no contact tokens remain by the time we get to this point -
replaceGreetingTokensactually replaces any contact or hook tokens in the provided string - and test cover is very solidComments