Replace auto_link with link_to in email templates.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8984 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/mailer/account_information.html.erb b/app/views/mailer/account_information.html.erb
index 70040f8e3e52c6ac54222f1ce1deb2d545fcefba..426aacee1f7f562b6bd21f2e64c4b54a9b0119a2 100644 (file)
--- a/app/views/mailer/account_information.html.erb
+++ b/app/views/mailer/account_information.html.erb
@@ -8,4 +8,4 @@
 </ul>
 <% end %>
 
-<p><%= l(:label_login) %>: <%= auto_link(@login_url).html_safe %></p>
+<p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p>

diff --git a/app/views/mailer/lost_password.html.erb b/app/views/mailer/lost_password.html.erb
index 18d1be3037abe7037a37a1f4558729ab4a8e79db..d740480adcd04c6aca733e113f68105b0a12acea 100644 (file)
--- a/app/views/mailer/lost_password.html.erb
+++ b/app/views/mailer/lost_password.html.erb
@@ -1,4 +1,4 @@
 <p><%= l(:mail_body_lost_password) %><br />
-<%= auto_link(@url).html_safe %></p>
+<%= link_to h(@url), @url %></p>
 
 <p><%= l(:field_login) %>: <b><%=h @token.user.login %></b></p>

diff --git a/app/views/mailer/register.html.erb b/app/views/mailer/register.html.erb
index 2e382e6ba06cd7433dcc547112d70327545c241d..282deca9094ac8d91d5414d6aa20bdeb52de03c8 100644 (file)
--- a/app/views/mailer/register.html.erb
+++ b/app/views/mailer/register.html.erb
@@ -1,2 +1,2 @@
 <p><%= l(:mail_body_register) %><br />
-<%= auto_link(@url).html_safe %></p>
+<%= link_to h(@url), @url %></p>

diff --git a/app/views/mailer/test.html.erb b/app/views/mailer/test.html.erb
index fe5b6f3134e20edd5f4ddff30ef8d5dae46d94bb..1e81b3bfe95a1254018a33859ed640e045879de6 100644 (file)
--- a/app/views/mailer/test.html.erb
+++ b/app/views/mailer/test.html.erb
@@ -1,2 +1,2 @@
 <p>This is a test email sent by Redmine.<br />
-Redmine URL: <%= auto_link(@url).html_safe %></p>
+Redmine URL: <%= link_to h(@url), @url %></p>