From: Tom Hughes <tom@compton.nu>
Date: Fri, 9 Mar 2012 23:06:14 +0000 (+0000)
Subject: Don't escape the heading as it contains a link
X-Git-Tag: live~6329
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e23313fbd492c714cdd3eb5757d8d019e86611b0

Don't escape the heading as it contains a link
---

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 777022dab..a50ac75d7 100644
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,8 +1,8 @@
 <% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %>
-<h1><%= t('user_block.edit.title',
-          :name => link_to(
-                           h(@user_block.user.display_name),
-                           {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %></h1>
+<h1><%= raw t('user_block.edit.title',
+              :name => link_to(
+                               h(@user_block.user.display_name),
+                               {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %></h1>
 
 <%= form_for(@user_block) do |f| %>
   <%= f.error_messages %>
diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index 0819357d3..28ae01930 100644
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,13 +1,13 @@
 <% @title = t('user_block.revoke.title',
               :block_on => h(@user_block.user.display_name),
               :block_by => h(@user_block.creator.display_name)) %>
-<h1><%= 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>
+<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>