From 5fa25ec36320450283f64dd9fe01a035a0a8ca54 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 9 Jan 2018 16:02:55 -0700
Subject: [PATCH] =?UTF-8?q?don=E2=80=99t=20wrap=20markdown=20in=20<p>=20ta?=
 =?UTF-8?q?gs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/grav/templates/forms/field.html.twig | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/themes/grav/templates/forms/field.html.twig b/themes/grav/templates/forms/field.html.twig
index c44e348f..4aa66e25 100644
--- a/themes/grav/templates/forms/field.html.twig
+++ b/themes/grav/templates/forms/field.html.twig
@@ -28,15 +28,15 @@
                 {% block label %}
                     {% if field.help %}
                         {% if field.markdown %}
-                            <span class="hint--bottom" data-hint="{{ field.help|tu|markdown|e('html') }}">{{ field.label|tu|markdown|raw }}</span>
+                            <span class="hint--bottom" data-hint="{{ field.help|tu|markdown(false)|e('html') }}">{{ field.label|tu|markdown(false)|raw }}</span>
                         {% else %}
                             <span class="hint--bottom" data-hint="{{ field.help|tu|e('html') }}">{{ field.label|tu|raw }}</span>
                         {% endif %}
                     {% else %}
                         {% if field.markdown %}
-                            {{ field.label|tu|raw }}
+                            {{ field.label|tu|markdown(false)|raw }}
                         {% else %}
-                            {{ field.label|tu|markdown|raw }}
+                            {{ field.label|tu|raw }}
                         {% endif %}
                     {% endif %}
                     {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
@@ -44,7 +44,11 @@
                 </label>
                 {% if field.sublabel %}
                 <div class="form-sublabel">
-                    {{ field.sublabel|tu|markdown|raw }}
+                    {% if field.markdown %}
+                        {{ field.sublabel|tu|markdown(false)|raw }}
+                    {% else %}
+                        {{ field.sublabel|tu|raw }}
+                    {% endif %}
                 </div>
                 {% endif %}
             </div>
@@ -91,7 +95,7 @@
                     <div class="form-extra-wrapper {{ field.size }} {{ field.wrapper_classes }}">
                         <span class="form-description">
                             {% if field.markdown %}
-                                {{ field.description|tu|markdown|raw }}
+                                {{ field.description|tu|markdown(false)|raw }}
                             {% else %}
                                 {{ field.description|tu|raw }}
                             {% endif %}