Fix coalesce warning

[airbundle] / Resources / views / mail / recover.html.twig

diff --git a/Resources/views/mail/recover.html.twig b/Resources/views/mail/recover.html.twig
index d7ed80926daec97b8845394cd522199e8ca9a2d4..95bdf8c7338c6265e68773a4476f2db569ffe036 100644 (file)
--- a/Resources/views/mail/recover.html.twig
+++ b/Resources/views/mail/recover.html.twig
@@ -1,14 +1,14 @@
-{% extends '@RapsysAir/mail/body.html.twig' %}
+{% extends '@RapsysAir/mail/base.html.twig' %}

 {% block title %}{{ subject }}{% endblock %}
 {% block content %}
        <table class="content">
                <tr>
                        <td>&nbsp;</td>
                        <td>
 {% block title %}{{ subject }}{% endblock %}
 {% block content %}
        <table class="content">
                <tr>
                        <td>&nbsp;</td>
                        <td>

-                               <h2>{{ 'Subject: %subject%'|trans({'%subject%': 'welcome back to %site_title%'|trans({'%site_title%': site_title|trans})}) }}</h2>
-                               <p>{{ 'Thanks so much for rejoining %site_title%, the space reservation program.'|trans({'%site_title%': site_title|trans}) }}</p>
-                               <p>{% trans %}To recover your account you can follow this link: {% endtrans %}</p>
-                               <p><a href="{{ recover_url }}">{{ recover_url }}</a></p>
+                               <h2>{{ 'Subject: %subject%'|trans({'%subject%': subject})|raw }}</h2>
+                               <p>{{ 'Thanks so much for rejoining %title.site%, the space reservation program.'|trans({'%title.site%': title.site}) }}</p>
+                               <p>{% trans %}To recover your account follow this link:{% endtrans %}</p>
+                               <p><a href="{{ recover_url|escape('html_attr') }}" class="link">{{ recover_url }}</a></p>

                        </td>
                        <td>&nbsp;</td>
                </tr>
                        </td>
                        <td>&nbsp;</td>
                </tr>