Fix coalesce warning

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

diff --git a/Resources/views/mail/recover_mail.html.twig b/Resources/views/mail/recover_mail.html.twig
index 0cfc299506eb510176b190d0a01506129da24b75..611ac5c84baa647fdf15ad5ead41cc3318234b40 100644 (file)
--- a/Resources/views/mail/recover_mail.html.twig
+++ b/Resources/views/mail/recover_mail.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>
-                               <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 %}Your account password has been changed, 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%': 'welcome back to %title.site%'|trans({'%title.site%': title.site})|raw}) }}</h2>
+                               <p>{{ 'Thanks so much for rejoining %title.site%, the space reservation program.'|trans({'%title.site%': title.site}) }}</p>
+                               <p>{{ 'Your account password has been changed, to recover your account you can follow this link: '|trans }}</p>
+                               <p><a href="{{ recover_url|escape('html_attr') }}">{{ recover_url }}</a></p>
                        </td>
                        <td>&nbsp;</td>
                </tr>