Browse files

[SwiftmailerBundle] fixed email display in the web profiler when the …

…message is not in UTF-8
  • Loading branch information...
1 parent 976f8b1 commit 08285edef973a0c2392503ba499d761e086c49d2 @fabpot fabpot committed Oct 16, 2011
View
2 src/Symfony/Bundle/SwiftmailerBundle/Resources/views/Collector/swiftmailer.html.twig
@@ -38,7 +38,7 @@
{% endfor %}
<p>
- <pre>{{ message.body|e('html', message.charset) }}</pre>
+ <pre>{{ message.body|e('html', message.charset)|convert_encoding('UTF-8', message.charset) }}</pre>
</p>
{% endfor %}
{% endif %}
View
2 vendors.php
@@ -31,7 +31,7 @@
array('doctrine-common', 'http://github.com/doctrine/common.git', 'origin/master'),
array('monolog', 'http://github.com/Seldaek/monolog.git', '1.0.1'),
array('swiftmailer', 'http://github.com/swiftmailer/swiftmailer.git', 'v4.1.2'),
- array('twig', 'http://github.com/fabpot/Twig.git', 'v1.3.0'),
+ array('twig', 'http://github.com/fabpot/Twig.git', 'origin/master'),
);
foreach ($deps as $dep) {

0 comments on commit 08285ed

Please sign in to comment.