Defect #11262 » 0001-Fix-escaping-of-html-links-in-wiki-mailer-notificati.patch
| app/views/mailer/wiki_content_added.html.erb | ||
|---|---|---|
| 1 | 1 |
<p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), |
| 2 |
:author => h(@wiki_content.author)) %><br /> |
|
| 2 |
:author => h(@wiki_content.author)).html_safe %><br />
|
|
| 3 | 3 |
<em><%=h @wiki_content.comments %></em></p> |
| app/views/mailer/wiki_content_updated.html.erb | ||
|---|---|---|
| 1 | 1 |
<p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), |
| 2 |
:author => h(@wiki_content.author)) %><br /> |
|
| 2 |
:author => h(@wiki_content.author)).html_safe %><br />
|
|
| 3 | 3 |
<em><%=h @wiki_content.comments %></em></p> |
| 4 | 4 | |
| 5 | 5 |
<p><%= l(:label_view_diff) %>:<br /> |
| test/unit/mailer_test.rb | ||
|---|---|---|
| 404 | 404 |
Setting.default_language = lang.to_s |
| 405 | 405 |
assert_difference 'ActionMailer::Base.deliveries.size' do |
| 406 | 406 |
assert Mailer.wiki_content_added(content).deliver |
| 407 |
assert_select_email do |
|
| 408 |
assert_select 'a[href=?]', |
|
| 409 |
'http://mydomain.foo/projects/ecookbook/wiki/CookBook_documentation', |
|
| 410 |
:text => 'CookBook documentation' |
|
| 411 |
end |
|
| 407 | 412 |
end |
| 408 | 413 |
end |
| 409 | 414 |
end |
| ... | ... | |
| 414 | 419 |
Setting.default_language = lang.to_s |
| 415 | 420 |
assert_difference 'ActionMailer::Base.deliveries.size' do |
| 416 | 421 |
assert Mailer.wiki_content_updated(content).deliver |
| 422 |
assert_select_email do |
|
| 423 |
assert_select 'a[href=?]', |
|
| 424 |
'http://mydomain.foo/projects/ecookbook/wiki/CookBook_documentation', |
|
| 425 |
:text => 'CookBook documentation' |
|
| 426 |
end |
|
| 417 | 427 |
end |
| 418 | 428 |
end |
| 419 | 429 |
end |