Render Note field tokens correctly - they are already HTML. #13283
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)
|
mattwire
reviewed
Jan 3, 2019
Civi/Token/TokenRow.php
Outdated
| @@ -225,6 +226,10 @@ public function fill($format = NULL) { | |||
| if ($entity == 'activity' && $field == 'details') { | |||
| $htmlTokens[$entity][$field] = $value; | |||
| } | |||
| elseif (\CRM_Utils_Array::value('data_type', \CRM_Utils_Array::value($field, $entityFields['values'])) == 'Memo') { | |||
| // Memo fields aka custom fields of type Note are html. | |||
| $htmlTokens[$entity][$field] = $value; | |||
There was a problem hiding this comment.
@seamuslee001 Could you review from a security perspective? Are we ok to insert html directly into tokens?
There was a problem hiding this comment.
@aydun this is more likely to be considered secure if you use the CRM_Utils_String::purifyHTML() function
There was a problem hiding this comment.
Thanks @colemanw - changed now
There was a problem hiding this comment.
@colemanw @seamuslee001 with this change is it mergeable?
|
Hmm - the test is not failing locally. Jenkins retest please. |
|
test this please |
Closed
|
Given Aydun has responded to Coleman's comment and it looks sensible to me i'm good with merging this |
|
Thanks @seamuslee001 |
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
Extracted from #13174 and #12012 Small bug fix so that tokens of Note fields are rendered correctly. They are already HTML so don't convert them to HTML again.