Skip to content

Commit

Permalink
Don't HTML-encode field instructions (#3928)
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Mar 6, 2019
1 parent 04e1a19 commit 1f72a7c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG-v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

### Fixed
- Fixed a bug where the `positionedBefore` element query param was not including direct ancestors in the results.
- Fixed a bug where HTML in plugin-supplied field instructions was getting encoded. ([#3928](https://github.com/craftcms/cms/issues/3928))

## 3.1.16 - 2019-03-05

Expand Down
2 changes: 1 addition & 1 deletion src/templates/_includes/forms/field.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</label>
{% endif %}
{% if instructions %}
<div class="instructions">{{ instructions|nl2br|md|replace('/&amp;(\\w+);/', '&$1;')|raw }}</div>
<div class="instructions">{{ instructions|raw|nl2br|md|replace('/&amp;(\\w+);/', '&$1;')|raw }}</div>
{% endif %}
</div>
{% endif %}
Expand Down

0 comments on commit 1f72a7c

Please sign in to comment.