Merge remote-tracking branch 'upstream/pull/2558'

[rails.git] / app / views / user_blocks / edit.html.erb

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>