Avoid double-escaping display names when sent through the translation system

They are escaped properly without the h() call, and doing that just double-escapes them

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index d8f4cd8f553689941c361ecc3bffc2a44186ce51..d3a0f70b267a5cfbc409e896aed35ddb14448ad5 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
   <div id="userinformation">
     <%= user_image @entry.user %>
 <% content_for :heading do %>
   <div id="userinformation">
     <%= user_image @entry.user %>

-    <h2><%= link_to t(".user_title", :user => h(@entry.user.display_name)), :action => :index %></h2>
+    <h2><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h2>

     <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
   </div>
 <% end %>
     <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
   </div>
 <% end %>

diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index 2aac33efaf7f15cca3f302208030383ad2af0837..f5d94dc9407894219bcd17a0b3e593c2e73b4721 100644 (file)
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t(".send_message_to_html", :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %></h2>
+  <h2><%= t(".send_message_to_html", :name => link_to(@message.recipient.display_name, user_path(@message.recipient))) %></h2>

 <% end %>
 
 <%= error_messages_for "message" %>
 <% end %>
 
 <%= error_messages_for "message" %>

diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index 6b4e60daa864745b5cde54c4b0a0ce2a8c9edb07..d5283925bf9e61a1b788103875a78d07b2326936 100644 (file)
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -1,4 +1,4 @@
-<% @title = t(".title", :name => h(@user.display_name)) %>
+<% @title = t(".title", :name => @user.display_name) %>

 <% content_for :heading do %>
   <h1><%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %></h1>
 <% end %>
 <% content_for :heading do %>
   <h1><%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %></h1>
 <% end %>


@@ -6,5 +6,5 @@
 <% unless @user_blocks.empty? %>
 <%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => true, :show_creator_name => false } %>
 <% else %>
 <% unless @user_blocks.empty? %>
 <%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => true, :show_creator_name => false } %>
 <% else %>

-<p><%= t ".empty", :name => h(@user.display_name) %></p>
+<p><%= t ".empty", :name => @user.display_name %></p>

 <% end %>
 <% end %>

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 69ab5f9f30669eb0f776fbc83bf98876c880192c..7b2471eab4b189011069072e5e5a8f2026339fac 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,4 +1,4 @@
-<% @title = t ".title", :name => h(@user_block.user.display_name) %>
+<% @title = t ".title", :name => @user_block.user.display_name %>

 <% content_for :heading do %>
   <h1><%= t(".heading_html",
             :name => link_to(@user_block.user.display_name,
 <% content_for :heading do %>
   <h1><%= t(".heading_html",
             :name => link_to(@user_block.user.display_name,


@@ -13,7 +13,7 @@
   <%= f.error_messages %>
 
   <p>
   <%= f.error_messages %>
 
   <p>

-    <%= f.label :reason, t(".reason", :name => h(@user_block.user.display_name)) %><br />
+    <%= f.label :reason, t(".reason", :name => @user_block.user.display_name) %><br />

     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
   </p>
   <p>
     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
   </p>
   <p>

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index 18b03eda9f0c9ca908b9de35fb47bc0fec00aa34..c2832e348a5792a2f53c5f8beb97142ab0f8151a 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,4 +1,4 @@
-<% @title = t ".title", :name => h(@user.display_name) %>
+<% @title = t ".title", :name => @user.display_name %>

 <% content_for :heading do %>
   <h1><%= t(".heading_html",
             :name => link_to(@user.display_name,
 <% content_for :heading do %>
   <h1><%= t(".heading_html",
             :name => link_to(@user.display_name,

diff --git a/app/views/users/no_such_user.html.erb b/app/views/users/no_such_user.html.erb
index 8f94cf372a8c922dfc58566d2a0217d5ceb8705c..f181434a3f0c95b52363daaa69f8fccf59c47b84 100644 (file)
--- a/app/views/users/no_such_user.html.erb
+++ b/app/views/users/no_such_user.html.erb
@@ -1,4 +1,4 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t ".heading", :user => h(@not_found_user) %></h1>
+  <h1><%= t ".heading", :user => @not_found_user %></h1>

 <% end %>
 <% end %>

-<p><%= t ".body", :user => h(@not_found_user) %></p>
+<p><%= t ".body", :user => @not_found_user %></p>