Merge branch '2.7' into 2.8

* 2.7:
  Fix for missing whitespace control modifier in form layout
This commit is contained in:
Nicolas Grekas 2017-12-04 20:58:03 +01:00
commit c865b03fd5

View File

@ -306,7 +306,7 @@
{% if not child.rendered %} {% if not child.rendered %}
{{- form_row(child) -}} {{- form_row(child) -}}
{% endif %} {% endif %}
{%- endfor %} {%- endfor -%}
{% if not form.methodRendered and form is rootform %} {% if not form.methodRendered and form is rootform %}
{%- do form.setMethodRendered() -%} {%- do form.setMethodRendered() -%}
@ -320,7 +320,7 @@
{%- if form_method != method -%} {%- if form_method != method -%}
<input type="hidden" name="_method" value="{{ method }}" /> <input type="hidden" name="_method" value="{{ method }}" />
{%- endif -%} {%- endif -%}
{% endif %} {% endif -%}
{% endblock form_rest %} {% endblock form_rest %}
{# Support #} {# Support #}