From 1f72a7cce25a0143b21ca17ffee8eb697561da8d Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Wed, 6 Mar 2019 06:23:43 -0800
Subject: [PATCH] Don't HTML-encode field instructions (#3928)

---
 CHANGELOG-v3.md                          | 1 +
 src/templates/_includes/forms/field.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
index 3ad71a87921..634e26030fd 100644
--- a/CHANGELOG-v3.md
+++ b/CHANGELOG-v3.md
@@ -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
 
diff --git a/src/templates/_includes/forms/field.html b/src/templates/_includes/forms/field.html
index 6a5dcb621a7..e85601dc8e7 100644
--- a/src/templates/_includes/forms/field.html
+++ b/src/templates/_includes/forms/field.html
@@ -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 %}