Merge branch 'bug-1390'

9 years ago · 5a7e585320
parent e3611f709b c28a5e261f
commit 5a7e585320
1 changed files with 1 additions and 1 deletions
--- a/manager/application/views/scripts/mail/read.phtml
+++ b/manager/application/views/scripts/mail/read.phtml
@ -7,4 +7,4 @@ $this->headLink()->appendStylesheet('/css/mail.css');
 ?>
 <H1><?php print I18n::_('Read Mail'); ?></H1>
 <?php
-print nl2br($this->mail_body);
+print nl2br(htmlspecialchars(quoted_printable_decode($this->mail_body), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));