summaryrefslogtreecommitdiffstats
path: root/app/views/mailer
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-02-23 10:11:08 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-02-23 10:11:08 +0000
commitb778c51e9049ca2c0d745a699db6d93d53b71175 (patch)
tree8608956d05f884b557ea3451bead74a4dc9441f0 /app/views/mailer
parentec201b08b3cfd1e115704abdbd7bc541a3651fe1 (diff)
downloadredmine-b778c51e9049ca2c0d745a699db6d93d53b71175.tar.gz
redmine-b778c51e9049ca2c0d745a699db6d93d53b71175.zip
Removed unneeded #h calls in views.
git-svn-id: http://svn.redmine.org/redmine/trunk@14043 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/mailer')
-rw-r--r--app/views/mailer/_issue.html.erb2
-rw-r--r--app/views/mailer/account_activated.html.erb2
-rw-r--r--app/views/mailer/account_activation_request.html.erb2
-rw-r--r--app/views/mailer/account_information.html.erb6
-rw-r--r--app/views/mailer/attachments_added.html.erb4
-rw-r--r--app/views/mailer/document_added.html.erb2
-rw-r--r--app/views/mailer/lost_password.html.erb4
-rw-r--r--app/views/mailer/message_posted.html.erb4
-rw-r--r--app/views/mailer/news_added.html.erb4
-rw-r--r--app/views/mailer/news_comment_added.html.erb2
-rw-r--r--app/views/mailer/register.html.erb2
-rw-r--r--app/views/mailer/test_email.html.erb2
-rw-r--r--app/views/mailer/wiki_content_added.html.erb4
-rw-r--r--app/views/mailer/wiki_content_updated.html.erb6
14 files changed, 23 insertions, 23 deletions
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index 6b84a5be1..9461d8490 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -1,4 +1,4 @@
-<h1><%= link_to(h("#{issue.tracker.name} ##{issue.id}: #{issue.subject}"), issue_url) %></h1>
+<h1><%= link_to("#{issue.tracker.name} ##{issue.id}: #{issue.subject}", issue_url) %></h1>
<%= render_email_issue_attributes(issue, users.first, true) %>
diff --git a/app/views/mailer/account_activated.html.erb b/app/views/mailer/account_activated.html.erb
index cb8d8caa1..6dc952238 100644
--- a/app/views/mailer/account_activated.html.erb
+++ b/app/views/mailer/account_activated.html.erb
@@ -1,2 +1,2 @@
<p><%= l(:notice_account_activated) %></p>
-<p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p>
+<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
diff --git a/app/views/mailer/account_activation_request.html.erb b/app/views/mailer/account_activation_request.html.erb
index 4450631b9..b19cf3219 100644
--- a/app/views/mailer/account_activation_request.html.erb
+++ b/app/views/mailer/account_activation_request.html.erb
@@ -1,2 +1,2 @@
<p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
-<p><%= link_to h(@url), @url %></p>
+<p><%= link_to @url, @url %></p>
diff --git a/app/views/mailer/account_information.html.erb b/app/views/mailer/account_information.html.erb
index 426aacee1..4d4066d65 100644
--- a/app/views/mailer/account_information.html.erb
+++ b/app/views/mailer/account_information.html.erb
@@ -3,9 +3,9 @@
<% else %>
<p><%= l(:mail_body_account_information) %>:</p>
<ul>
- <li><%= l(:field_login) %>: <%=h @user.login %></li>
- <li><%= l(:field_password) %>: <%=h @password %></li>
+ <li><%= l(:field_login) %>: <%= @user.login %></li>
+ <li><%= l(:field_password) %>: <%= @password %></li>
</ul>
<% end %>
-<p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p>
+<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
diff --git a/app/views/mailer/attachments_added.html.erb b/app/views/mailer/attachments_added.html.erb
index 11d1cf54c..d2355b1c4 100644
--- a/app/views/mailer/attachments_added.html.erb
+++ b/app/views/mailer/attachments_added.html.erb
@@ -1,5 +1,5 @@
-<%= link_to h(@added_to), @added_to_url %><br />
+<%= link_to @added_to, @added_to_url %><br />
<ul><% @attachments.each do |attachment | %>
-<li><%=h attachment.filename %></li>
+<li><%= attachment.filename %></li>
<% end %></ul>
diff --git a/app/views/mailer/document_added.html.erb b/app/views/mailer/document_added.html.erb
index 8606dd784..e3ece786d 100644
--- a/app/views/mailer/document_added.html.erb
+++ b/app/views/mailer/document_added.html.erb
@@ -1,3 +1,3 @@
-<%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
+<%= link_to(@document.title, @document_url) %> (<%= @document.category.name %>)<br />
<br />
<%= textilizable(@document, :description, :only_path => false) %>
diff --git a/app/views/mailer/lost_password.html.erb b/app/views/mailer/lost_password.html.erb
index d740480ad..9294bcfae 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 />
-<%= link_to h(@url), @url %></p>
+<%= link_to @url, @url %></p>
-<p><%= l(:field_login) %>: <b><%=h @token.user.login %></b></p>
+<p><%= l(:field_login) %>: <b><%= @token.user.login %></b></p>
diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index f43a8cf0f..3401b1816 100644
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -1,4 +1,4 @@
-<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
-<em><%=h @message.author %></em>
+<h1><%= @message.board.project.name %> - <%= @message.board.name %>: <%= link_to(@message.subject, @message_url) %></h1>
+<em><%= @message.author %></em>
<%= textilizable(@message, :content, :only_path => false) %>
diff --git a/app/views/mailer/news_added.html.erb b/app/views/mailer/news_added.html.erb
index 758ebccb8..daf250adf 100644
--- a/app/views/mailer/news_added.html.erb
+++ b/app/views/mailer/news_added.html.erb
@@ -1,4 +1,4 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
-<em><%=h @news.author.name %></em>
+<h1><%= link_to(@news.title, @news_url) %></h1>
+<em><%= @news.author.name %></em>
<%= textilizable(@news, :description, :only_path => false) %>
diff --git a/app/views/mailer/news_comment_added.html.erb b/app/views/mailer/news_comment_added.html.erb
index ef2be0f65..c9cc2a78e 100644
--- a/app/views/mailer/news_comment_added.html.erb
+++ b/app/views/mailer/news_comment_added.html.erb
@@ -1,4 +1,4 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
+<h1><%= link_to(@news.title, @news_url) %></h1>
<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
diff --git a/app/views/mailer/register.html.erb b/app/views/mailer/register.html.erb
index 282deca90..5e8f6dfcf 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 />
-<%= link_to h(@url), @url %></p>
+<%= link_to @url, @url %></p>
diff --git a/app/views/mailer/test_email.html.erb b/app/views/mailer/test_email.html.erb
index 1e81b3bfe..c73f0e341 100644
--- a/app/views/mailer/test_email.html.erb
+++ b/app/views/mailer/test_email.html.erb
@@ -1,2 +1,2 @@
<p>This is a test email sent by Redmine.<br />
-Redmine URL: <%= link_to h(@url), @url %></p>
+Redmine URL: <%= link_to @url, @url %></p>
diff --git a/app/views/mailer/wiki_content_added.html.erb b/app/views/mailer/wiki_content_added.html.erb
index 8c83f62c8..f6d92a9d8 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),
+<p><%= l(:mail_body_wiki_content_added, :id => link_to(@wiki_content.page.pretty_title, @wiki_content_url),
:author => h(@wiki_content.author)).html_safe %><br />
-<em><%=h @wiki_content.comments %></em></p>
+<em><%= @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 f1f3857bd..83a9a1675 100644
--- a/app/views/mailer/wiki_content_updated.html.erb
+++ b/app/views/mailer/wiki_content_updated.html.erb
@@ -1,6 +1,6 @@
-<p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
+<p><%= l(:mail_body_wiki_content_updated, :id => link_to(@wiki_content.page.pretty_title, @wiki_content_url),
:author => h(@wiki_content.author)).html_safe %><br />
-<em><%=h @wiki_content.comments %></em></p>
+<em><%= @wiki_content.comments %></em></p>
<p><%= l(:label_view_diff) %>:<br />
-<%= link_to h(@wiki_diff_url), @wiki_diff_url %></p>
+<%= link_to @wiki_diff_url, @wiki_diff_url %></p>