summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-02-17 08:23:59 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-02-17 08:23:59 +0000
commitc495dba18a91c11361308292fecbce2178d24d40 (patch)
treed7ef5949f2e4153578574ae5b3a0f5138534c755
parentb455ac2a27aefccdf10c9f3a1727e1edb8b41ae1 (diff)
downloadredmine-c495dba18a91c11361308292fecbce2178d24d40.tar.gz
redmine-c495dba18a91c11361308292fecbce2178d24d40.zip
Rails3: view: mail: html_safe for header and footer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8894 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/layouts/mailer.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index e4860fd52..056196cd3 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -25,9 +25,9 @@ hr {
</style>
</head>
<body>
-<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header) %></span>
+<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span>
<%= yield %>
<hr />
-<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer) %></span>
+<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span>
</body>
</html>