Merge branch 'master' into openID

[rails.git] / 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 24a1d1e660452126c278ca343b0168086b35ce2d..bc405ecce4b6682a67dcae292071f2c815956283 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -17,11 +17,8 @@
 
 <p><b><%= t'user_block.show.status' %></b>: <%= block_status(@user_block) %></p>
 
-<p>
-  <b><%= t'user_block.show.reason' %></b>
-  <%=h @user_block.reason %>
-</p>
-
+<p><b><%= t'user_block.show.reason' %></b></p>
+<%= htmlize(@user_block.reason) %>
 
 <% if @user_block.ends_at > Time.now.getutc %>
 <% if @user and @user.id == @user_block.creator_id %>