fixes core#4047 - htmlspecialchars called on empty array #356
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)
|
HTML/Common.php
Outdated
| @@ -141,7 +141,7 @@ function _getAttrString($attributes) | |||
| if (is_array($attributes)) { | |||
| $charset = HTML_Common::charset(); | |||
| foreach ($attributes as $key => $value) { | |||
| $strAttr .= ' ' . $key . '="' . htmlspecialchars(($value ?? ''), ENT_COMPAT, $charset) . '"'; | |||
| $strAttr .= ' ' . $key . '="' . htmlspecialchars(($value ?: ''), ENT_COMPAT, $charset) . '"'; | |||
There was a problem hiding this comment.
Is 0 a possible legit value here?
There was a problem hiding this comment.
Hmm - good point. I can't say definitively but I'll account for that.
ad6f08b to
4bf4eca
Compare
HTML/Common.php
Outdated
| @@ -141,7 +141,7 @@ function _getAttrString($attributes) | |||
| if (is_array($attributes)) { | |||
| $charset = HTML_Common::charset(); | |||
| foreach ($attributes as $key => $value) { | |||
| $strAttr .= ' ' . $key . '="' . htmlspecialchars(($value ?? ''), ENT_COMPAT, $charset) . '"'; | |||
| $strAttr .= ' ' . $key . '="' . htmlspecialchars((is_array($value) ? '' : $value ?? ''), ENT_COMPAT, $charset) . '"'; | |||
There was a problem hiding this comment.
@MegaphoneJon just for the sake of clarity are you able to put ( and ) around the $value ?? '' in the false part of the first ternary operator
There was a problem hiding this comment.
Sorry @seamuslee001, just saw this.
4bf4eca to
67d6294
Compare
|
thanks @MegaphoneJon |
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.
Full details on https://lab.civicrm.org/dev/core/-/issues/4047, but basically - we are sometimes passing empty arrays to this function. Seems like the other instances that were changed on #346 will always be strings, unlike this one.