X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/46761798797638a4ef8c35b3bf8e5b1ee83e263f..7d0a94552c78652c1c8a858b15998b6254184ed1:/app/views/user_blocks/show.html.erb

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index ccd6df06f..51fbcaf49 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -6,16 +6,16 @@
   <h1><%= raw t('user_block.show.heading',
                 :block_on => link_to(
                                      h(@user_block.user.display_name),
-                                     {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
+                                     user_path(@user_block.user)),
                 :block_by => link_to(
                                      h(@user_block.creator.display_name),
-                                     {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>
+                                     user_path(@user_block.creator))) %></h1>
 <ul class='secondary-actions clearfix'>
   <% if @user_block.ends_at > Time.now.getutc %>
-    <% if @user and @user.id == @user_block.creator_id %>
+    <% if current_user and current_user.id == @user_block.creator_id %>
       <li><%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %></li>
     <% end %>
-    <% if @user and @user.moderator? %>
+    <% if current_user and current_user.moderator? %>
       <li><%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %></li>
     <% end %>
   <% end %>
@@ -26,7 +26,7 @@
 <% if @user_block.revoker %>
 <p>
   <b><%= t'user_block.show.revoker' %></b>
-  <%= link_to h(@user_block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => @user_block.revoker.display_name %>
+  <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
 </p>
 <% end %>