Merge branch 'develop' of github.com:getgrav/grav-plugin-form into de…

…velop
getgrav · Feb 16, 2021 · b56bac8 · b56bac8
2 parents b315f2e + a381adf
commit b56bac8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/templates/forms/default/data.txt.twig b/templates/forms/default/data.txt.twig
@@ -9,7 +9,7 @@
         {%- if show_field %}
             {%- set value = form.value(scope ~ (field.name ?? index)) -%}
             {%- if value -%}
-            {{- field.label|t|e }}: {{ string(value is iterable ? value|json_encode : value|e) ~ "\r\n" }}
+            {{- field.label|t|e }}: {{ string(value is iterable ? value|json_encode : value|escape('yaml')) ~ "\r\n" }}
             {%- endif -%}
         {%- endif %}
     {%- endif %}

diff --git a/templates/forms/fields/hidden/hidden.html.twig b/templates/forms/fields/hidden/hidden.html.twig
@@ -11,5 +11,5 @@
 {% endif %}
 {% set input_value = value is iterable ? value|join(',') : value|string %}
 
-<input data-grav-field="hidden" data-grav-disabled="false" type="hidden" class="input" name="{{ (scope ~ field.name)|fieldName }}" value="{{ input_value|e('html_attr') }}" />
+<input data-grav-field="hidden" data-grav-disabled="false" {% if field.id is defined %}id="{{ field.id|e }}" {% endif %}type="hidden" class="input" name="{{ (scope ~ field.name)|fieldName }}" value="{{ input_value|e('html_attr') }}" />
 {% endblock %}