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

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

diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index a8d761288406adf1868850074a704d1f8a3e7ca5..8b7a290fca24aba8b9383ba4b32460b6e2353053 100644 (file)
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -1,10 +1,10 @@
-<% @title = t('user_block.blocks_by.title', :name => h(@this_user.display_name)) %>
+<% @title = t('user_block.blocks_by.title', :name => h(@user.display_name)) %>
 <% content_for :heading do %>
-  <h1><%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %></h1>
+  <h1><%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
 <% end %>
 
 <% unless @user_blocks.empty? %>
-<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => false } %>
+<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => false } %>
 <% else %>
-<p><%= t "user_block.blocks_by.empty", :name => h(@this_user.display_name) %></p>
+<p><%= t "user_block.blocks_by.empty", :name => h(@user.display_name) %></p>
 <% end %>