Skip to content
This repository was archived by the owner on Feb 6, 2022. It is now read-only.

Added alternative mail formats view #33

Merged
merged 1 commit into from
Mar 25, 2013
+12 −0
Merged

Added alternative mail formats view #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Resources/views/Collector/swiftmailer.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,18 @@
{%- endif -%}
</pre>
</p>
{% for messagePart in message.children if messagePart.contentType == 'text/plain' or messagePart.contentType == 'text/html' %}
<h4>Alternative part</h4>
<p>
<pre>
{%- if messagePart.charset %}
{{- messagePart.body|e('html', messagePart.charset)|convert_encoding('UTF-8', messagePart.charset) }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldn't this be escaped a second time by the auto-escaper ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, should I just remove the escaping or also the convert_encoding?
Also, why does it escapes 2 times? Isn't it escaped as the main body?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are escaping it once explicitly, and converting the charset (which is not a filter marked as safe for the auto-escaper) and the auto-escaper escapes it again.

You should remove the e filter IMO (and also in the else part)

{%- else %}
{{- messagePart.body|e('html') }}
{%- endif -%}
</pre>
</p>
{% endfor %}
{% endfor %}
{% endif %}
{% endblock %}