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

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

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

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= raw(t(".heading", :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
+  <h1><%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %></h1>

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