diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-17 09:20:49 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-17 09:20:49 +0000 |
| commit | f6e7daaf18270dda00474539bf8365f65c598568 (patch) | |
| tree | 7ed845ef45b62d259c4c1e12af2dd2cbfa2cc075 /app/views | |
| parent | c495dba18a91c11361308292fecbce2178d24d40 (diff) | |
| download | redmine-f6e7daaf18270dda00474539bf8365f65c598568.tar.gz redmine-f6e7daaf18270dda00474539bf8365f65c598568.zip | |
Rails3: view: mail: html_safe for auto_link
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8895 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/mailer/account_information.html.erb | 2 | ||||
| -rw-r--r-- | app/views/mailer/lost_password.html.erb | 2 | ||||
| -rw-r--r-- | app/views/mailer/register.html.erb | 2 | ||||
| -rw-r--r-- | app/views/mailer/test.html.erb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/mailer/account_information.html.erb b/app/views/mailer/account_information.html.erb index 94c3297ed..70040f8e3 100644 --- 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) %></p> +<p><%= l(:label_login) %>: <%= auto_link(@login_url).html_safe %></p> diff --git a/app/views/mailer/lost_password.html.erb b/app/views/mailer/lost_password.html.erb index 40bb8e9c9..18d1be303 100644 --- 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) %></p> +<%= auto_link(@url).html_safe %></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 145c3d7c9..2e382e6ba 100644 --- 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) %></p> +<%= auto_link(@url).html_safe %></p> diff --git a/app/views/mailer/test.html.erb b/app/views/mailer/test.html.erb index 25ad20c51..fe5b6f313 100644 --- 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) %></p> +Redmine URL: <%= auto_link(@url).html_safe %></p> |