Don't escape the heading as it contains a link

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

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index 321b145a3907ca39c66911b06f555f42f9a470c8..28ae01930f6a674a0197dc8e3c2ce8095fb38a04 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,13 +1,20 @@
-<h1><%= t('user_block.revoke.heading', 
-       :block_on => @user_block.user.display_name, 
-        :block_by => @user_block.creator.display_name) %></h1>
+<% @title = t('user_block.revoke.title',
+              :block_on => h(@user_block.user.display_name),
+              :block_by => h(@user_block.creator.display_name)) %>
+<h1><%= raw t('user_block.revoke.heading',
+              :block_on => link_to(
+                                   h(@user_block.user.display_name),
+                                   {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}),
+              :block_by => link_to(
+                                   h(@user_block.creator.display_name),
+                                   {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %></h1>

 
 <% if @user_block.ends_at > Time.now %>
 <p><b>
   <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
 </b></p>
 
 
 <% if @user_block.ends_at > Time.now %>
 <p><b>
   <%= t('user_block.revoke.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
 </b></p>
 

-<% form_for :revoke, :url => { :action => "revoke" } do |f| %>
+<%= form_for :revoke, :url => { :action => "revoke" } do |f| %>

   <%= f.error_messages %>
 <p>  
   <%= check_box_tag 'confirm', 'yes' %>
   <%= f.error_messages %>
 <p>  
   <%= check_box_tag 'confirm', 'yes' %>