diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-06-26 17:03:08 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-06-26 17:03:08 +0000 |
| commit | f9f5e9e7c6c601aea66d1e15c818e1fae8bae81f (patch) | |
| tree | edeaf0e8883ff55df33034d8bc107532fe4165b0 /app/views/mailer | |
| parent | 6529035ee128c9b995a7a85d347f20ed1412f3ab (diff) | |
| download | redmine-f9f5e9e7c6c601aea66d1e15c818e1fae8bae81f.tar.gz redmine-f9f5e9e7c6c601aea66d1e15c818e1fae8bae81f.zip | |
Fixed: Link is escaped in wiki added/updated notification email (#11262).
Patch by Łukasz Jachymczyk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9896 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/mailer')
| -rw-r--r-- | app/views/mailer/wiki_content_added.html.erb | 2 | ||||
| -rw-r--r-- | app/views/mailer/wiki_content_updated.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/mailer/wiki_content_added.html.erb b/app/views/mailer/wiki_content_added.html.erb index 160f5730f..8c83f62c8 100644 --- a/app/views/mailer/wiki_content_added.html.erb +++ b/app/views/mailer/wiki_content_added.html.erb @@ -1,3 +1,3 @@ <p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), - :author => h(@wiki_content.author)) %><br /> + :author => h(@wiki_content.author)).html_safe %><br /> <em><%=h @wiki_content.comments %></em></p> diff --git a/app/views/mailer/wiki_content_updated.html.erb b/app/views/mailer/wiki_content_updated.html.erb index 8ef24d1ba..f1f3857bd 100644 --- a/app/views/mailer/wiki_content_updated.html.erb +++ b/app/views/mailer/wiki_content_updated.html.erb @@ -1,5 +1,5 @@ <p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), - :author => h(@wiki_content.author)) %><br /> + :author => h(@wiki_content.author)).html_safe %><br /> <em><%=h @wiki_content.comments %></em></p> <p><%= l(:label_view_diff) %>:<br /> |