From 263200fd7b9e76b039b4e5ad75131944064b801c Mon Sep 17 00:00:00 2001
From: jimcottrell <jim@aspendigital.com>
Date: Tue, 3 Oct 2017 13:41:14 -0600
Subject: [PATCH] Support form field commentHtml flag for section, checkbox,
 and switch types (#3150)

---
 modules/backend/widgets/form/partials/_field_checkbox.htm | 2 +-
 modules/backend/widgets/form/partials/_field_section.htm  | 2 +-
 modules/backend/widgets/form/partials/_field_switch.htm   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/backend/widgets/form/partials/_field_checkbox.htm b/modules/backend/widgets/form/partials/_field_checkbox.htm
index 5fdd87766..830350651 100644
--- a/modules/backend/widgets/form/partials/_field_checkbox.htm
+++ b/modules/backend/widgets/form/partials/_field_checkbox.htm
@@ -18,6 +18,6 @@
         <?= e(trans($field->label)) ?>
     </label>
     <?php if ($field->comment): ?>
-        <p class="help-block"><?= e(trans($field->comment)) ?></p>
+        <p class="help-block"><?= $field->commentHtml ? trans($field->comment) : e(trans($field->comment)) ?></p>
     <?php endif ?>
 </div>
diff --git a/modules/backend/widgets/form/partials/_field_section.htm b/modules/backend/widgets/form/partials/_field_section.htm
index ce3e74007..2ece19bda 100644
--- a/modules/backend/widgets/form/partials/_field_section.htm
+++ b/modules/backend/widgets/form/partials/_field_section.htm
@@ -5,6 +5,6 @@
     <?php endif ?>
 
     <?php if ($field->comment): ?>
-        <p class="help-block"><?= e(trans($field->comment)) ?></p>
+        <p class="help-block"><?= $field->commentHtml ? trans($field->comment) : e(trans($field->comment)) ?></p>
     <?php endif ?>
 </div>
\ No newline at end of file
diff --git a/modules/backend/widgets/form/partials/_field_switch.htm b/modules/backend/widgets/form/partials/_field_switch.htm
index bc065ccfe..74cf3b7f2 100644
--- a/modules/backend/widgets/form/partials/_field_switch.htm
+++ b/modules/backend/widgets/form/partials/_field_switch.htm
@@ -2,7 +2,7 @@
 <div class="field-switch">
     <label><?= e(trans($field->label)) ?></label>
     <?php if ($field->comment): ?>
-        <p class="help-block"><?= e(trans($field->comment)) ?></p>
+        <p class="help-block"><?= $field->commentHtml ? trans($field->comment) : e(trans($field->comment)) ?></p>
     <?php endif ?>
 </div>