jro_apps/redmine Commit - r9713:f9f5e9e7c6c6

Fixed: Link is escaped in wiki added/updated notification email (#11262)....

Jean-Philippe Lang -

r9713:f9f5e9e7c6c6

parent child

Context file:

r9713:f9f5e9e7c6c6

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),
-                                                    :author => h(@wiki_content.author)) %><br />
+                                                    :author => h(@wiki_content.author)).html_safe %><br />
             <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),
-                                                      :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 />

test/unit/mailer_test.rb +10 0

                   Setting.default_language = lang.to_s
                   assert_difference 'ActionMailer::Base.deliveries.size' do
                     assert Mailer.wiki_content_added(content).deliver
+                    assert_select_email do
+                      assert_select 'a[href=?]',
+                        'http://mydomain.foo/projects/ecookbook/wiki/CookBook_documentation',
+                        :text => 'CookBook documentation'
+                    end
                   end
                 end
               end
                   Setting.default_language = lang.to_s
                   assert_difference 'ActionMailer::Base.deliveries.size' do
                     assert Mailer.wiki_content_updated(content).deliver
+                    assert_select_email do
+                      assert_select 'a[href=?]',
+                        'http://mydomain.foo/projects/ecookbook/wiki/CookBook_documentation',
+                        :text => 'CookBook documentation'
+                    end
                   end
                 end
               end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages