Merge pull request #2352 from damienalexandre/newline-email

XWB · web-flow · commit bac06611c47e · 2016-12-03T17:18:20.000+01:00
Make sure their is no new line in email subject
diff --git a/Resources/views/Registration/email.txt.twig b/Resources/views/Registration/email.txt.twig
@@ -1,8 +1,9 @@
 {% block subject %}
-{% autoescape false %}
+{%- autoescape false -%}
 {{ 'registration.email.subject'|trans({'%username%': user.username, '%confirmationUrl%': confirmationUrl}, 'FOSUserBundle') }}
-{% endautoescape %}
+{%- endautoescape -%}
 {% endblock %}
+
 {% block body_text %}
 {% autoescape false %}
 {{ 'registration.email.message'|trans({'%username%': user.username, '%confirmationUrl%': confirmationUrl}, 'FOSUserBundle') }}
diff --git a/Resources/views/Resetting/email.txt.twig b/Resources/views/Resetting/email.txt.twig
@@ -1,8 +1,9 @@
 {% block subject %}
-{% autoescape false %}
+{%- autoescape false -%}
 {{ 'resetting.email.subject'|trans({'%username%': user.username, '%confirmationUrl%': confirmationUrl}, 'FOSUserBundle') }}
-{% endautoescape %}
+{%- endautoescape -%}
 {% endblock %}
+
 {% block body_text %}
 {% autoescape false %}
 {{ 'resetting.email.message'|trans({'%username%': user.username, '%confirmationUrl%': confirmationUrl}, 'FOSUserBundle') }}
